diff options
| -rw-r--r-- | archaeological_files/data_importer.py | 3 | ||||
| -rw-r--r-- | archaeological_files/models.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/data_importer.py | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/archaeological_files/data_importer.py b/archaeological_files/data_importer.py index a5fa3c18d..7e3c0c118 100644 --- a/archaeological_files/data_importer.py +++ b/archaeological_files/data_importer.py @@ -272,8 +272,7 @@ class FileImporterSraPdL(FilePostProcessing, Importer): ImportFormater( # BT, 72 nom service instructeur ['responsible_town_planning_service__attached_to__name', ], [UnicodeFormater(300, clean=True), ], - regexp=RE_NAME_ADD_CD_POSTAL_TOWN, - regexp_formater_args=[[0], ], + regexp=RE_ORGA, comment=u"Service instructeur - nom", required=False), None, # BU, 73 diff --git a/archaeological_files/models.py b/archaeological_files/models.py index a442d99c2..3e35ddcf3 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -411,8 +411,8 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, updated += self.update_raw_general_contractor() updated += self.update_corpo_general_contractor() if self.year and self.numeric_reference: - external_id = u"{}{}-{}".format(settings.ISHTAR_LOCAL_PREFIX, - self.year, self.numeric_reference) + external_id = u"{}{}-{}".format(settings.ISHTAR_LOCAL_PREFIX, + self.year, self.numeric_reference) if external_id != self.external_id: updated = True self.external_id = external_id diff --git a/archaeological_operations/data_importer.py b/archaeological_operations/data_importer.py index 6c89ebaa5..b4cd2f0d0 100644 --- a/archaeological_operations/data_importer.py +++ b/archaeological_operations/data_importer.py @@ -156,7 +156,7 @@ RE_ADD_CD_POSTAL_TOWN = re.compile("(.+)?[, ]*(\d{2} *\d{3})[, ]*(.+)") RE_CD_POSTAL_FILTER = re.compile("(\d*) (\d*)") -RE_ORGA = re.compile("([^,]*)") +RE_ORGA = re.compile("([^,\n]*)") class OperationImporterBibracte(Importer): |