diff options
| -rw-r--r-- | archaeological_files/data_importer.py | 5 | ||||
| -rw-r--r-- | archaeological_operations/data_importer.py | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/archaeological_files/data_importer.py b/archaeological_files/data_importer.py index c6dbf4034..a2e83fd66 100644 --- a/archaeological_files/data_importer.py +++ b/archaeological_files/data_importer.py @@ -82,6 +82,11 @@ class FilePostProcessing(object): idx = y_idx except ValueError: pass + if idx and item.year: + try: + item.numeric_reference = int(idx) + except ValueError: + pass if not item.year: if item.creation_date: item.year = item.creation_date.year diff --git a/archaeological_operations/data_importer.py b/archaeological_operations/data_importer.py index 5083910c2..6c89ebaa5 100644 --- a/archaeological_operations/data_importer.py +++ b/archaeological_operations/data_importer.py @@ -49,8 +49,15 @@ class ImportParcelFormater(ImportFormater): try: models.Parcel.objects.get_or_create(**parcel_dct) except IntegrityError: - raise ImporterError("Erreur d'import parcelle, contexte : %s" - % unicode(parcel_dct)) + try: + p = unicode(parcel_dct) + except UnicodeDecodeError: + try: + p = str(parcel_dct).decode('utf-8') + except UnicodeDecodeError: + p = u"" + raise ImporterError(u"Erreur d'import parcelle, contexte : %s" + % p) class ImportYearFormater(ImportFormater): |