diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-11 02:52:04 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-11 02:52:04 +0200 |
commit | 153f850062bcddcacd325141d845882b438d61b2 (patch) | |
tree | e0229d7584b491b63403e922b0b2999ad0e8bb7f | |
parent | a31a0507f5f8321dd8ced1eb25e4024a39a8fd90 (diff) | |
download | Ishtar-153f850062bcddcacd325141d845882b438d61b2.tar.bz2 Ishtar-153f850062bcddcacd325141d845882b438d61b2.zip |
Imports: fix for finds import
-rw-r--r-- | ishtar_common/data_importer.py | 9 | ||||
-rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 794 |
2 files changed, 403 insertions, 400 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 30dd7d76c..333a81877 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -408,7 +408,7 @@ class StrToBoolean(Formater): for missing in self.missings: try: q = {'target':self.db_target, 'key':missing} - models.TargetKey.objects.create(**q) + TargetKey.objects.create(**q) except IntegrityError: pass @@ -782,7 +782,10 @@ class Importer(object): cls._meta.get_field_by_name(attribute) if m2m: val = data.pop(attribute) - model = field_object.rel.to + if hasattr(field_object, 'rel'): + model = field_object.rel.to + elif hasattr(field_object, 'to'): + model = field_object.to if val.__class__ == model: m2ms.append((attribute, val)) elif val.__class__ != model and type(val) == dict: @@ -852,7 +855,7 @@ class Importer(object): try: dct = create_dict.copy() dct['defaults'] = defaults - obj, created = cls.objects.get_or_create(**create_dict) + obj, created = cls.objects.get_or_create(**dct) if self.import_instance and hasattr(obj, 'imports'): obj.imports.add(self.import_instance) except IntegrityError as e: diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 2b37ecaf9..4cb490128 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -107,281 +107,6 @@ } }, { - "pk": 2, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 3, - "required": true, - "importer_type": 1, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 3, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 4, - "required": true, - "importer_type": 1, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 8, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 9, - "required": false, - "importer_type": 1, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 4, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 5, - "required": true, - "importer_type": 1, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 6, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 7, - "required": true, - "importer_type": 1, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 7, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 8, - "required": true, - "importer_type": 1, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 15, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "required": true, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 17, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 4, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 18, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 5, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 19, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 6, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 20, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 7, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 21, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 8, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 22, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 9, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 23, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 12, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 24, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 13, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 25, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 16, - "required": false, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 16, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 3, - "required": true, - "importer_type": 3, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 5, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 6, - "required": true, - "importer_type": 1, - "description": null, - "regexp_pre_filter": null - } - }, - { - "pk": 37, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 2, - "required": true, - "importer_type": 5, - "description": "identifiant externe", - "regexp_pre_filter": null - } - }, - { - "pk": 38, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 3, - "required": false, - "importer_type": 5, - "description": "Isol\u00e9 ou non", - "regexp_pre_filter": null - } - }, - { - "pk": 39, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 7, - "required": false, - "importer_type": 5, - "description": "Sous classe de mat\u00e9riaux", - "regexp_pre_filter": null - } - }, - { - "pk": 40, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 10, - "required": false, - "importer_type": 5, - "description": "Nombre d'\u00e9l\u00e9ments", - "regexp_pre_filter": null - } - }, - { - "pk": 41, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 11, - "required": false, - "importer_type": 5, - "description": "Poids", - "regexp_pre_filter": null - } - }, - { - "pk": 42, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 12, - "required": false, - "importer_type": 5, - "description": "Unit\u00e9 de poids", - "regexp_pre_filter": null - } - }, - { - "pk": 43, - "model": "ishtar_common.importercolumn", - "fields": { - "col_number": 13, - "required": true, - "importer_type": 5, - "description": "Lien avec l'UE", - "regexp_pre_filter": null - } - }, - { "pk": 44, "model": "ishtar_common.importercolumn", "fields": { @@ -658,212 +383,277 @@ }, { "pk": 2, - "model": "ishtar_common.importtarget", + "model": "ishtar_common.importercolumn", "fields": { - "column": 2, - "formater_type": 2, - "target": "operation_type", - "regexp_filter": null + "col_number": 3, + "required": true, + "importer_type": 1, + "description": null, + "regexp_pre_filter": null } }, { "pk": 3, - "model": "ishtar_common.importtarget", + "model": "ishtar_common.importercolumn", "fields": { - "column": 3, - "formater_type": 3, - "target": "common_name", - "regexp_filter": null + "col_number": 4, + "required": true, + "importer_type": 1, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 4, - "model": "ishtar_common.importtarget", + "pk": 8, + "model": "ishtar_common.importercolumn", "fields": { - "column": 4, - "formater_type": 3, - "target": "operator__name", - "regexp_filter": null + "col_number": 9, + "required": false, + "importer_type": 1, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 5, - "model": "ishtar_common.importtarget", + "pk": 4, + "model": "ishtar_common.importercolumn", "fields": { - "column": 5, - "formater_type": 4, - "target": "in_charge__raw_name", - "regexp_filter": null + "col_number": 5, + "required": true, + "importer_type": 1, + "description": null, + "regexp_pre_filter": null } }, { "pk": 6, - "model": "ishtar_common.importtarget", + "model": "ishtar_common.importercolumn", "fields": { - "column": 6, - "formater_type": 5, - "target": "start_date", - "regexp_filter": null + "col_number": 7, + "required": true, + "importer_type": 1, + "description": null, + "regexp_pre_filter": null } }, { "pk": 7, - "model": "ishtar_common.importtarget", + "model": "ishtar_common.importercolumn", "fields": { - "column": 7, - "formater_type": 5, - "target": "excavation_end_date", - "regexp_filter": null + "col_number": 8, + "required": true, + "importer_type": 1, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 8, - "model": "ishtar_common.importtarget", + "pk": 15, + "model": "ishtar_common.importercolumn", "fields": { - "column": 8, - "formater_type": 6, - "target": "periods", - "regexp_filter": null + "col_number": 2, + "required": true, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 10, - "model": "ishtar_common.importtarget", + "pk": 17, + "model": "ishtar_common.importercolumn", "fields": { - "column": 10, - "formater_type": 7, - "target": "section", - "regexp_filter": null + "col_number": 4, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 11, - "model": "ishtar_common.importtarget", + "pk": 18, + "model": "ishtar_common.importercolumn", "fields": { - "column": 10, - "formater_type": 8, - "target": "parcel_number", - "regexp_filter": null + "col_number": 5, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 12, - "model": "ishtar_common.importtarget", + "pk": 19, + "model": "ishtar_common.importercolumn", "fields": { - "column": 11, - "formater_type": 9, - "target": "year", - "regexp_filter": null + "col_number": 6, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 14, - "model": "ishtar_common.importtarget", + "pk": 20, + "model": "ishtar_common.importercolumn", "fields": { - "column": 13, - "formater_type": 10, - "target": "address", - "regexp_filter": null + "col_number": 7, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 16, - "model": "ishtar_common.importtarget", + "pk": 21, + "model": "ishtar_common.importercolumn", "fields": { - "column": 15, - "formater_type": 11, - "target": "external_id", - "regexp_filter": null + "col_number": 8, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 17, - "model": "ishtar_common.importtarget", + "pk": 22, + "model": "ishtar_common.importercolumn", "fields": { - "column": 16, - "formater_type": 12, - "target": "source_type", - "regexp_filter": null + "col_number": 9, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 18, - "model": "ishtar_common.importtarget", + "pk": 23, + "model": "ishtar_common.importercolumn", "fields": { - "column": 17, - "formater_type": 13, - "target": "support_type", - "regexp_filter": null + "col_number": 12, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 19, - "model": "ishtar_common.importtarget", + "pk": 24, + "model": "ishtar_common.importercolumn", "fields": { - "column": 18, - "formater_type": 1, - "target": "item_number", - "regexp_filter": null + "col_number": 13, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 20, - "model": "ishtar_common.importtarget", + "pk": 25, + "model": "ishtar_common.importercolumn", "fields": { - "column": 19, - "formater_type": 4, - "target": "authors__person__raw_name", - "regexp_filter": null + "col_number": 16, + "required": false, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 21, - "model": "ishtar_common.importtarget", + "pk": 16, + "model": "ishtar_common.importercolumn", "fields": { - "column": 20, - "formater_type": 14, - "target": "creation_date", - "regexp_filter": null + "col_number": 3, + "required": true, + "importer_type": 3, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 22, - "model": "ishtar_common.importtarget", + "pk": 5, + "model": "ishtar_common.importercolumn", "fields": { - "column": 21, - "formater_type": 15, - "target": "format_type", - "regexp_filter": null + "col_number": 6, + "required": true, + "importer_type": 1, + "description": null, + "regexp_pre_filter": null } }, { - "pk": 23, - "model": "ishtar_common.importtarget", + "pk": 37, + "model": "ishtar_common.importercolumn", "fields": { - "column": 22, - "formater_type": 16, - "target": "description", - "regexp_filter": null + "col_number": 2, + "required": true, + "importer_type": 5, + "description": "identifiant externe", + "regexp_pre_filter": null } }, { - "pk": 24, - "model": "ishtar_common.importtarget", + "pk": 38, + "model": "ishtar_common.importercolumn", "fields": { - "column": 23, - "formater_type": 16, - "target": "comment", - "regexp_filter": null + "col_number": 3, + "required": false, + "importer_type": 5, + "description": "Isol\u00e9 ou non", + "regexp_pre_filter": null } }, { - "pk": 25, - "model": "ishtar_common.importtarget", + "pk": 39, + "model": "ishtar_common.importercolumn", "fields": { - "column": 24, - "formater_type": 17, - "target": "scale", - "regexp_filter": null + "col_number": 7, + "required": false, + "importer_type": 5, + "description": "Sous classe de mat\u00e9riaux", + "regexp_pre_filter": null + } + }, + { + "pk": 40, + "model": "ishtar_common.importercolumn", + "fields": { + "col_number": 10, + "required": false, + "importer_type": 5, + "description": "Nombre d'\u00e9l\u00e9ments", + "regexp_pre_filter": null + } + }, + { + "pk": 41, + "model": "ishtar_common.importercolumn", + "fields": { + "col_number": 11, + "required": false, + "importer_type": 5, + "description": "Poids", + "regexp_pre_filter": null + } + }, + { + "pk": 42, + "model": "ishtar_common.importercolumn", + "fields": { + "col_number": 12, + "required": false, + "importer_type": 5, + "description": "Unit\u00e9 de poids", + "regexp_pre_filter": null + } + }, + { + "pk": 43, + "model": "ishtar_common.importercolumn", + "fields": { + "col_number": 13, + "required": true, + "importer_type": 5, + "description": "Lien avec l'UE", + "regexp_pre_filter": null } }, { @@ -1167,6 +957,216 @@ } }, { + "pk": 2, + "model": "ishtar_common.importtarget", + "fields": { + "column": 2, + "formater_type": 2, + "target": "operation_type", + "regexp_filter": null + } + }, + { + "pk": 3, + "model": "ishtar_common.importtarget", + "fields": { + "column": 3, + "formater_type": 3, + "target": "common_name", + "regexp_filter": null + } + }, + { + "pk": 4, + "model": "ishtar_common.importtarget", + "fields": { + "column": 4, + "formater_type": 3, + "target": "operator__name", + "regexp_filter": null + } + }, + { + "pk": 5, + "model": "ishtar_common.importtarget", + "fields": { + "column": 5, + "formater_type": 4, + "target": "in_charge__raw_name", + "regexp_filter": null + } + }, + { + "pk": 6, + "model": "ishtar_common.importtarget", + "fields": { + "column": 6, + "formater_type": 5, + "target": "start_date", + "regexp_filter": null + } + }, + { + "pk": 7, + "model": "ishtar_common.importtarget", + "fields": { + "column": 7, + "formater_type": 5, + "target": "excavation_end_date", + "regexp_filter": null + } + }, + { + "pk": 8, + "model": "ishtar_common.importtarget", + "fields": { + "column": 8, + "formater_type": 6, + "target": "periods", + "regexp_filter": null + } + }, + { + "pk": 10, + "model": "ishtar_common.importtarget", + "fields": { + "column": 10, + "formater_type": 7, + "target": "section", + "regexp_filter": null + } + }, + { + "pk": 11, + "model": "ishtar_common.importtarget", + "fields": { + "column": 10, + "formater_type": 8, + "target": "parcel_number", + "regexp_filter": null + } + }, + { + "pk": 12, + "model": "ishtar_common.importtarget", + "fields": { + "column": 11, + "formater_type": 9, + "target": "year", + "regexp_filter": null + } + }, + { + "pk": 14, + "model": "ishtar_common.importtarget", + "fields": { + "column": 13, + "formater_type": 10, + "target": "address", + "regexp_filter": null + } + }, + { + "pk": 16, + "model": "ishtar_common.importtarget", + "fields": { + "column": 15, + "formater_type": 11, + "target": "external_id", + "regexp_filter": null + } + }, + { + "pk": 17, + "model": "ishtar_common.importtarget", + "fields": { + "column": 16, + "formater_type": 12, + "target": "source_type", + "regexp_filter": null + } + }, + { + "pk": 18, + "model": "ishtar_common.importtarget", + "fields": { + "column": 17, + "formater_type": 13, + "target": "support_type", + "regexp_filter": null + } + }, + { + "pk": 19, + "model": "ishtar_common.importtarget", + "fields": { + "column": 18, + "formater_type": 1, + "target": "item_number", + "regexp_filter": null + } + }, + { + "pk": 20, + "model": "ishtar_common.importtarget", + "fields": { + "column": 19, + "formater_type": 4, + "target": "authors__person__raw_name", + "regexp_filter": null + } + }, + { + "pk": 21, + "model": "ishtar_common.importtarget", + "fields": { + "column": 20, + "formater_type": 14, + "target": "creation_date", + "regexp_filter": null + } + }, + { + "pk": 22, + "model": "ishtar_common.importtarget", + "fields": { + "column": 21, + "formater_type": 15, + "target": "format_type", + "regexp_filter": null + } + }, + { + "pk": 23, + "model": "ishtar_common.importtarget", + "fields": { + "column": 22, + "formater_type": 16, + "target": "description", + "regexp_filter": null + } + }, + { + "pk": 24, + "model": "ishtar_common.importtarget", + "fields": { + "column": 23, + "formater_type": 16, + "target": "comment", + "regexp_filter": null + } + }, + { + "pk": 25, + "model": "ishtar_common.importtarget", + "fields": { + "column": 24, + "formater_type": 17, + "target": "scale", + "regexp_filter": null + } + }, + { "pk": 5, "model": "ishtar_common.formatertype", "fields": { |