summaryrefslogtreecommitdiff
path: root/chimere/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/utils.py')
-rw-r--r--chimere/utils.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/chimere/utils.py b/chimere/utils.py
index cdd053d..3a6c518 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -81,9 +81,13 @@ class ImportManager:
'import_key__icontains':'%s:%s;' % (key, import_key),
'import_source':self.importer_instance.source}
try:
+ item = None
if pk:
- item = cls.objects.get(pk=pk)
- else:
+ try:
+ item = cls.objects.get(pk=pk)
+ except:
+ pass
+ if not item:
item = cls.objects.get(**dct_import)
if version and item.import_version == int(version):
# no update since the last import
@@ -505,7 +509,7 @@ class CSVManager(ImportManager):
dct['route'] = geom
else:
continue
- import_key = pk if pk else name
+ import_key = pk if pk else name.decode('utf-8')
item, updated, created = self.create_or_update_item(cls, dct,
import_key, pk=pk)
if updated: