Mercurial Mercurial > iconolab-mcc / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change natural key definition 0.1.31
authorymh <ymh.work@gmail.com>
Sat, 23 Jun 2018 02:04:20 +0200
changeset 14 bff393b23a68
parent 13 56608f42821f
child 15 6116368d1fe6
change natural key definition
src/iconolab_mcc/__init__.py file | annotate | diff | comparison | revisions
src/iconolab_mcc/management/commands/importimages.py file | annotate | diff | comparison | revisions
src/setup.py file | annotate | diff | comparison | revisions 
--- a/src/iconolab_mcc/__init__.py	Fri Jun 22 17:34:37 2018 +0200
+++ b/src/iconolab_mcc/__init__.py	Sat Jun 23 02:04:20 2018 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 1, 30, "final", 0)
+VERSION = (0, 1, 31, "final", 0)
 
 VERSION_STR = ".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))
 
--- a/src/iconolab_mcc/management/commands/importimages.py	Fri Jun 22 17:34:37 2018 +0200
+++ b/src/iconolab_mcc/management/commands/importimages.py	Sat Jun 23 02:04:20 2018 +0200
@@ -343,7 +343,8 @@
                 item_photo_credits = item['PHOT']
                 item_inventory_number = item['INV']
                 item_joconde_ref = item['REF']
-                if ItemMetadata.objects.filter(item__collection=collection, natural_key=item_joconde_ref).exists():
+                natural_key="%s|%s" % (collection.name,item_joconde_ref)
+                if ItemMetadata.objects.filter(item__collection=collection, natural_key=natural_key).exists():
                     print('#### An item with ' +
                           item['REF']+' for natural key, already exists in database in the import collection')
 
@@ -366,7 +367,7 @@
                             folder = Folder.objects.get(original_id=folder_id)
 
                         item_metadata = ItemMetadata.objects.get(
-                            item__collection=collection, natural_key=item_joconde_ref)
+                            item__collection=collection, natural_key=natural_key)
                         item = item_metadata.item
 
                         item.folders.add(folder)
@@ -388,7 +389,7 @@
                         "joconde_ref" : item_joconde_ref
                     }
                     self.create_item_and_metadata(
-                        item_joconde_ref, collection, new_metadata, item['SRC_IMG_FILES'], options, self.source_dir)
+                        natural_key, collection, new_metadata, item['SRC_IMG_FILES'], options, self.source_dir)
 
             print('# All done!')
 
--- a/src/setup.py	Fri Jun 22 17:34:37 2018 +0200
+++ b/src/setup.py	Sat Jun 23 02:04:20 2018 +0200
@@ -123,7 +123,7 @@
         setup_requires=['setuptools_scm'],
         install_requires=[
             "Django >= 2.0",
-            "iconolab == 0.1",
+            "iconolab == 0.1.1",
             "django-appconf",
             "django-comments-xtd",
             "django-contrib-comments",
iconolab-mcc