Update MCC importer fixture

1 files changed, 251 insertions, 152 deletions

diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index dd39f0139..fdb31104a 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -680,6 +680,17 @@
         }
     }, 
     {
+        "pk": 228, 
+        "model": "ishtar_common.importercolumn", 
+        "fields": {
+            "col_number": 20, 
+            "required": false, 
+            "importer_type": 5, 
+            "description": "Datations s\u00e9par\u00e9es par des \"&\"", 
+            "regexp_pre_filter": null
+        }
+    }, 
+    {
         "pk": 48, 
         "model": "ishtar_common.importercolumn", 
         "fields": {
@@ -720,6 +731,7 @@
             "target": "find__conservatory_state", 
             "column": 45, 
             "formater_type": 22, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -733,6 +745,7 @@
             "target": "find__preservation_to_consider", 
             "column": 46, 
             "formater_type": 23, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -746,6 +759,7 @@
             "target": "topographic_localisation", 
             "column": 48, 
             "formater_type": 3, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -759,6 +773,7 @@
             "target": "special_interest", 
             "column": 49, 
             "formater_type": 3, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -772,19 +787,7 @@
             "target": "description", 
             "column": 50, 
             "formater_type": 16, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 9, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": null, 
-            "target": "operation__code_patriarche", 
-            "column": 9, 
-            "formater_type": 1, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -798,6 +801,7 @@
             "target": "operation__code_patriarche", 
             "column": 14, 
             "formater_type": 1, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -811,6 +815,7 @@
             "target": "label", 
             "column": 27, 
             "formater_type": 3, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -824,19 +829,7 @@
             "target": "comment", 
             "column": 47, 
             "formater_type": 35, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 27, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": null, 
-            "target": "operation__code_patriarche", 
-            "column": 26, 
-            "formater_type": 1, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -850,6 +843,7 @@
             "target": "town__numero_insee", 
             "column": 12, 
             "formater_type": 11, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -863,6 +857,7 @@
             "target": "operation_type", 
             "column": 2, 
             "formater_type": 2, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -876,32 +871,7 @@
             "target": "label", 
             "column": 37, 
             "formater_type": 3, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 55, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": null, 
-            "target": "external_id", 
-            "column": 53, 
-            "formater_type": 11, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 251, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": "", 
-            "target": "context_record__external_id", 
-            "column": 226, 
-            "formater_type": 35, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -915,6 +885,7 @@
             "target": "common_name", 
             "column": 3, 
             "formater_type": 3, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -928,6 +899,7 @@
             "target": "operator__name", 
             "column": 4, 
             "formater_type": 3, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -941,6 +913,7 @@
             "target": "start_date", 
             "column": 6, 
             "formater_type": 5, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -954,6 +927,7 @@
             "target": "excavation_end_date", 
             "column": 7, 
             "formater_type": 5, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -967,19 +941,7 @@
             "target": "periods", 
             "column": 8, 
             "formater_type": 6, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 250, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": "", 
-            "target": "parcel__external_id", 
-            "column": 225, 
-            "formater_type": 28, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -993,6 +955,7 @@
             "target": "address", 
             "column": 13, 
             "formater_type": 10, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1006,6 +969,7 @@
             "target": "external_id", 
             "column": 15, 
             "formater_type": 11, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1019,6 +983,7 @@
             "target": "source_type", 
             "column": 16, 
             "formater_type": 12, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1032,19 +997,7 @@
             "target": "support_type", 
             "column": 17, 
             "formater_type": 13, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 252, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": "", 
-            "target": "context_record__external_id", 
-            "column": 227, 
-            "formater_type": 28, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1058,6 +1011,7 @@
             "target": "find__material_types", 
             "column": 39, 
             "formater_type": 20, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1071,6 +1025,7 @@
             "target": "item_number", 
             "column": 18, 
             "formater_type": 1, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1084,6 +1039,7 @@
             "target": "authors__person__raw_name", 
             "column": 19, 
             "formater_type": 4, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1097,6 +1053,7 @@
             "target": "creation_date", 
             "column": 20, 
             "formater_type": 14, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1110,6 +1067,7 @@
             "target": "format_type", 
             "column": 21, 
             "formater_type": 15, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1123,6 +1081,7 @@
             "target": "description", 
             "column": 22, 
             "formater_type": 16, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1136,6 +1095,7 @@
             "target": "comment", 
             "column": 23, 
             "formater_type": 16, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1149,6 +1109,7 @@
             "target": "scale", 
             "column": 24, 
             "formater_type": 17, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1162,6 +1123,7 @@
             "target": "parcel_number", 
             "column": 51, 
             "formater_type": 8, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1175,6 +1137,7 @@
             "target": "section", 
             "column": 52, 
             "formater_type": 7, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1188,6 +1151,7 @@
             "target": "scientist__raw_name", 
             "column": 5, 
             "formater_type": 4, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1201,19 +1165,7 @@
             "target": "year", 
             "column": 11, 
             "formater_type": 14, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 37, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": "", 
-            "target": "context_record__external_id", 
-            "column": 36, 
-            "formater_type": 11, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1227,6 +1179,7 @@
             "target": "comment", 
             "column": 34, 
             "formater_type": 16, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1240,6 +1193,7 @@
             "target": "identification", 
             "column": 30, 
             "formater_type": 24, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1253,6 +1207,7 @@
             "target": "interpretation", 
             "column": 54, 
             "formater_type": 16, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1266,6 +1221,7 @@
             "target": "additional_information", 
             "column": 25, 
             "formater_type": 16, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1279,6 +1235,7 @@
             "target": "unit", 
             "column": 28, 
             "formater_type": 18, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1292,6 +1249,7 @@
             "target": "description", 
             "column": 29, 
             "formater_type": 16, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1305,6 +1263,7 @@
             "target": "opening_date", 
             "column": 31, 
             "formater_type": 5, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1318,19 +1277,7 @@
             "target": "closing_date", 
             "column": 32, 
             "formater_type": 5, 
-            "regexp_filter": null, 
-            "concat": false, 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 34, 
-        "model": "ishtar_common.importtarget", 
-        "fields": {
-            "comment": null, 
-            "target": "parcel__external_id", 
-            "column": 33, 
-            "formater_type": 11, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1344,6 +1291,7 @@
             "target": "code_patriarche", 
             "column": 1, 
             "formater_type": 1, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1357,6 +1305,7 @@
             "target": "find__find_number", 
             "column": 40, 
             "formater_type": 1, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1370,6 +1319,7 @@
             "target": "find__weight", 
             "column": 41, 
             "formater_type": 21, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
@@ -1383,48 +1333,178 @@
             "target": "find__weight_unit", 
             "column": 42, 
             "formater_type": 7, 
+            "concat_str": null, 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
         }
     }, 
     {
-        "pk": 44, 
+        "pk": 45, 
         "model": "ishtar_common.importtarget", 
         "fields": {
             "comment": null, 
+            "target": "discovery_date", 
+            "column": 44, 
+            "formater_type": 5, 
+            "concat_str": null, 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 36, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": null, 
+            "target": "datings__period", 
+            "column": 35, 
+            "formater_type": 6, 
+            "concat_str": null, 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": true
+        }
+    }, 
+    {
+        "pk": 253, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "find__datings__period", 
+            "column": 228, 
+            "formater_type": 6, 
+            "concat_str": null, 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": true
+        }
+    }, 
+    {
+        "pk": 55, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "external_id", 
+            "column": 53, 
+            "formater_type": 11, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 27, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "operation__code_patriarche", 
+            "column": 26, 
+            "formater_type": 1, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 250, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "parcel__external_id", 
+            "column": 225, 
+            "formater_type": 28, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 34, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "parcel__external_id", 
+            "column": 33, 
+            "formater_type": 11, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 37, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "context_record__external_id", 
+            "column": 36, 
+            "formater_type": 11, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 252, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
+            "target": "context_record__external_id", 
+            "column": 227, 
+            "formater_type": 28, 
+            "concat_str": "-", 
+            "regexp_filter": null, 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 44, 
+        "model": "ishtar_common.importtarget", 
+        "fields": {
+            "comment": "", 
             "target": "context_record__external_id", 
             "column": 43, 
             "formater_type": 3, 
+            "concat_str": "-", 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
         }
     }, 
     {
-        "pk": 45, 
+        "pk": 9, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "comment": null, 
-            "target": "discovery_date", 
-            "column": 44, 
-            "formater_type": 5, 
+            "comment": "", 
+            "target": "operation__code_patriarche", 
+            "column": 9, 
+            "formater_type": 1, 
+            "concat_str": "-", 
             "regexp_filter": null, 
             "concat": false, 
             "force_new": false
         }
     }, 
     {
-        "pk": 36, 
+        "pk": 251, 
         "model": "ishtar_common.importtarget", 
         "fields": {
-            "comment": null, 
-            "target": "datings__period", 
-            "column": 35, 
-            "formater_type": 6, 
+            "comment": "", 
+            "target": "context_record__external_id", 
+            "column": 226, 
+            "formater_type": 35, 
+            "concat_str": "-", 
             "regexp_filter": null, 
             "concat": false, 
-            "force_new": true
+            "force_new": false
         }
     }, 
     {
@@ -1599,6 +1679,15 @@
         }
     }, 
     {
+        "pk": 35, 
+        "model": "ishtar_common.formatertype", 
+        "fields": {
+            "formater_type": "UnicodeFormater", 
+            "many_split": "", 
+            "options": ""
+        }
+    }, 
+    {
         "pk": 16, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -1716,15 +1805,6 @@
         }
     }, 
     {
-        "pk": 35, 
-        "model": "ishtar_common.formatertype", 
-        "fields": {
-            "formater_type": "UnicodeFormater", 
-            "many_split": "", 
-            "options": "None"
-        }
-    }, 
-    {
         "pk": 29, 
         "model": "ishtar_common.formatertype", 
         "fields": {
@@ -1747,7 +1827,20 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 5, 
+            "concat_str": null, 
             "field_name": "scientist__name", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 1, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 37, 
+            "concat_str": null, 
+            "field_name": "find__label", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1756,7 +1849,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 9, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1765,7 +1860,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 12, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1774,7 +1871,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 26, 
+            "concat_str": "-", 
             "field_name": "parcel__external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1783,7 +1882,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 26, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1792,7 +1893,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 225, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1801,7 +1904,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 33, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1810,34 +1915,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 27, 
+            "concat_str": "-", 
             "field_name": "external_id", 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 1, 
-        "model": "ishtar_common.importerduplicatefield", 
-        "fields": {
-            "column": 37, 
-            "field_name": "find__label", 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 2, 
-        "model": "ishtar_common.importerduplicatefield", 
-        "fields": {
-            "column": 37, 
-            "field_name": "context_record__external_id", 
-            "force_new": false
-        }
-    }, 
-    {
-        "pk": 3, 
-        "model": "ishtar_common.importerduplicatefield", 
-        "fields": {
-            "column": 37, 
-            "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1846,7 +1926,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 36, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1855,7 +1937,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 227, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1864,7 +1948,9 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 226, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }, 
@@ -1873,7 +1959,20 @@
         "model": "ishtar_common.importerduplicatefield", 
         "fields": {
             "column": 43, 
+            "concat_str": "-", 
+            "field_name": "external_id", 
+            "concat": false, 
+            "force_new": false
+        }
+    }, 
+    {
+        "pk": 3, 
+        "model": "ishtar_common.importerduplicatefield", 
+        "fields": {
+            "column": 37, 
+            "concat_str": "-", 
             "field_name": "external_id", 
+            "concat": false, 
             "force_new": false
         }
     }