diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-09-21 18:54:49 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-09-21 18:54:49 +0200 | 
| commit | 4245e1ce834c49f1fbd6843dad38c794048b6f6e (patch) | |
| tree | 4a47fc0bf016d13720e40764b8e522ebed870bf6 | |
| parent | 4e02ff3d2f163bb7aea10c61aac6c92e6ee434cc (diff) | |
| download | Ishtar-4245e1ce834c49f1fbd6843dad38c794048b6f6e.tar.bz2 Ishtar-4245e1ce834c49f1fbd6843dad38c794048b6f6e.zip | |
Flake8
| -rw-r--r-- | archaeological_finds/data_importer.py | 78 | 
1 files changed, 39 insertions, 39 deletions
| diff --git a/archaeological_finds/data_importer.py b/archaeological_finds/data_importer.py index 40808cbcd..4c955b52f 100644 --- a/archaeological_finds/data_importer.py +++ b/archaeological_finds/data_importer.py @@ -17,54 +17,52 @@  # See the file COPYING for details. -import re - -from django.utils.translation import ugettext_lazy as _ -  from ishtar_common.data_importer import *  from archaeological_finds import models -from archaeological_context_records.models import Period +  class FindsImporterBibracte(Importer):      DESC = u"Exports Bibracte : importeur pour l'onglet mobilier"      OBJECT_CLS = models.BaseFind -    DEFAULTS = { -               } +    DEFAULTS = {}      LINE_FORMAT = [          # OA          ImportFormater('context_record__operation__operation_code',                         IntegerFormater(),),          # external_id -        ImportFormater('external_id', UnicodeFormater(120, notnull=True), -               duplicate_fields=['find__external_id', 'label', 'find__label']), -        # isolé ou non (si non isolé = lot) -        ImportFormater('is_isolated', StrToBoolean( -                    choices={'lot':False, 'objet':True}), required=False), +        ImportFormater( +            'external_id', UnicodeFormater(120, notnull=True), +            duplicate_fields=['find__external_id', 'label', 'find__label']), +        # isolé ou non (si non isolé = lot) +        ImportFormater( +            'is_isolated', StrToBoolean(choices={'lot': False, 'objet': True}), +            required=False),          # ???          None,          # A voir          None,          # cf type          None, -        # Type = sous classe de matériaux = Liste hiérarchique -        ImportFormater('find__material_type', TypeFormater(models.MaterialType), -                       required=False), -        # ??? +        # Type = sous classe de matériaux = Liste hiérarchique +        ImportFormater('find__material_type', +                       TypeFormater(models.MaterialType), required=False), +        # ???          None, -        # lien avec contenant +        # lien avec contenant          None,          # = nombre          ImportFormater('find__find_number', IntegerFormater(), required=False),          # poids          ImportFormater('find__weight', FloatFormater(), required=False),          # unité (g par défault) -        ImportFormater('find__weight_unit', StrChoiceFormater(models.WEIGHT_UNIT), -                       required=False), +        ImportFormater('find__weight_unit', +                       StrChoiceFormater(models.WEIGHT_UNIT), required=False),          # lien UE          ImportFormater('context_record__external_id', UnicodeFormater(120),),          # date decouverte -        ImportFormater('discovery_date', DateFormater(['%Y/%m/%d']), required=False,), +        ImportFormater('discovery_date', DateFormater(['%Y/%m/%d']), +                       required=False,),          # lien parcelle (unique)          None,          # etat conservation @@ -77,12 +75,12 @@ class FindsImporterBibracte(Importer):          ImportFormater('comment', UnicodeFormater(1000), required=False),          # lien vers plusieurs chrono (voir gestion actuelle chrono)          None, -        #ImportFormater('find__dating__period', TypeFormater(Period, -        #                                      many_split="&"), required=False), -        # topographic_localisation +        # ImportFormater('find__dating__period', TypeFormater(Period, +        #                                   many_split="&"), required=False), +        # topographic_localisation          ImportFormater('topographic_localisation', UnicodeFormater(120),                         required=False), -        # special_interest +        # special_interest          ImportFormater('special_interest', UnicodeFormater(120),                         required=False),          # description @@ -91,11 +89,11 @@ class FindsImporterBibracte(Importer):          None      ] +  class FindAltImporterBibracte(Importer):      DESC = u"Exports Bibracte : importeur pour l'onglet prélèvement"      OBJECT_CLS = models.BaseFind -    DEFAULTS = { -               } +    DEFAULTS = {}      LINE_FORMAT = [          # code OA          ImportFormater('context_record__operation__operation_code', @@ -104,8 +102,8 @@ class FindAltImporterBibracte(Importer):          ImportFormater('external_id', UnicodeFormater(120, notnull=True),                         duplicate_fields=['find__external_id']),          # nature -        ImportFormater('find__material_type', TypeFormater(models.MaterialType), -                       required=False), +        ImportFormater('find__material_type', +                       TypeFormater(models.MaterialType), required=False),          # identifiant UE          ImportFormater('context_record__external_id', UnicodeFormater(120),),          # identifiant materiel @@ -114,16 +112,17 @@ class FindAltImporterBibracte(Importer):          ImportFormater('comment', UnicodeFormater(1000), required=False),      ] +  class ImportTreatmentFormater(ImportFormater):      def post_process(self, obj, context, value, owner=None):          if obj.upstream_treatment.count():              return -        ope_code = context['upstream_treatment']['base_finds']\ -                          ['context_record']['operation']['operation_code'] +        ope_code = context['upstream_treatment'][ +            'base_finds']['context_record']['operation']['operation_code']          ope_code = int(ope_code)          downstream = models.Find.objects.filter( -                external_id=value, -                base_finds__context_record__operation__operation_code=ope_code) +            external_id=value, +            base_finds__context_record__operation__operation_code=ope_code)          if not downstream.count():              return          downstream = downstream.all()[0] @@ -134,21 +133,22 @@ class ImportTreatmentFormater(ImportFormater):          upstream.save()          return +  class TreatmentImporterBibracte(Importer):      DESC = u"Exports Bibracte : importeur pour l'onglet traitement"      OBJECT_CLS = models.Treatment -    DEFAULTS = { -               } +    DEFAULTS = {}      LINE_FORMAT = [          # code OA          ImportFormater( -          'upstream_treatment__base_finds__context_record__operation__operation_code', -          UnicodeFormater(120, notnull=True)), +            'upstream_treatment__base_finds__context_record__operation__' +            'operation_code', +            UnicodeFormater(120, notnull=True)),          # identifiant -        ImportTreatmentFormater('external_id', -               UnicodeFormater(120, notnull=True), post_processing=True), +        ImportTreatmentFormater( +            'external_id', +            UnicodeFormater(120, notnull=True), post_processing=True),          None,          # traitement          ImportFormater('treatment_type', TypeFormater(models.TreatmentType),),      ] - | 
