diff options
| -rw-r--r-- | ishtar_common/management/commands/reassociate_similar_images.py | 21 | 
1 files changed, 13 insertions, 8 deletions
| diff --git a/ishtar_common/management/commands/reassociate_similar_images.py b/ishtar_common/management/commands/reassociate_similar_images.py index f255f4876..e76f4e725 100644 --- a/ishtar_common/management/commands/reassociate_similar_images.py +++ b/ishtar_common/management/commands/reassociate_similar_images.py @@ -72,11 +72,18 @@ class Command(BaseCommand):          if not quiet:              out.write("\n* {} missing images\n".format(len(missing_images))) -        attributes = ['title', 'associated_file', 'internal_reference', -                      'source_type', 'description'] +        attributes = [ +            'title', 'associated_file', 'internal_reference', 'source_type', +            'support_type', 'format_type', 'scale', +            'authors_raw', 'associated_url', 'receipt_date', 'creation_date', +            'receipt_date_in_documentation', 'item_number', 'description', +            'comment', 'additional_information', 'duplicate' +        ]          if not ignore_ref:              attributes.append('reference') +        m2ms = ['authors', 'licenses'] +          nb_conflicted_items = 0          nb_merged_items = 0          distinct_image = 0 @@ -142,12 +149,10 @@ class Command(BaseCommand):                      item.image.name.encode('utf-8'),                  ]) -                for author in ref_item.authors.all(): -                    if author not in item.authors: -                        item.authors.add(author) -                for author in item.authors.all(): -                    if author not in ref_item.authors: -                        ref_item.authors.add(author) +                for m2m in m2ms: +                    for m2 in getattr(item, m2m).all(): +                        if m2 not in getattr(ref_item, m2m): +                            getattr(ref_item, m2m).add(m2)                  for rel_attr in Document.RELATED_MODELS:                      ref_rel_items = [ | 
