From 3c20f955b08f8082ec624c8c12dc991e5069d420 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 7 May 2020 15:36:12 +0200 Subject: Imports: use the first formater for duplicates fields --- ishtar_common/data_importer.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'ishtar_common/data_importer.py') diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 179dfc329..847134085 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -1387,17 +1387,19 @@ class Importer(object): force_news = [force_new] concats = formater.concat concat_str = [concat_str] - for duplicate_field in formater.duplicate_fields: - if type(duplicate_field[0]) in (list, tuple): - duplicate_field, force_new, concat, conc_str = \ - duplicate_field[idx_v] - else: - duplicate_field, force_new, concat, conc_str = \ - duplicate_field - field_names += [duplicate_field] - force_news += [force_new] - concats += [concat] - concat_str += [conc_str] + if idx_fields == 0: + # duplicate fields are only for the first occurrence + for duplicate_field in formater.duplicate_fields: + if type(duplicate_field[0]) in (list, tuple): + duplicate_field, force_new, concat, conc_str = \ + duplicate_field[0] + else: + duplicate_field, force_new, concat, conc_str = \ + duplicate_field + field_names += [duplicate_field] + force_news += [force_new] + concats += [concat] + concat_str += [conc_str] if formater.through: self._throughs.append((formater, value)) -- cgit v1.2.3