diff options
Diffstat (limited to 'archaeological_files/data_importer.py')
| -rw-r--r-- | archaeological_files/data_importer.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/archaeological_files/data_importer.py b/archaeological_files/data_importer.py index 23e9c6a32..15072834a 100644 --- a/archaeological_files/data_importer.py +++ b/archaeological_files/data_importer.py @@ -50,7 +50,9 @@ class StrToBoolean(Formater): value = slugify(value) return value - def check(self, values): + def check(self, values, output=None): + if not output or output == 'silent': + return msgstr = unicode(_(u"Choice for \"%s\" is not available. "\ u"Which one is relevant?\n")) msgstr += u"1. True\n" @@ -418,15 +420,18 @@ class FileImporterSraPdL(Importer): def __init__(self, *args, **kwargs): super(FileImporterSraPdL, self).__init__(*args, **kwargs) - self.DEFAULTS[('in_charge',)]['attached_to'] = \ - models.Organization.objects.get(name='SRA Pays de la Loire') + self.DEFAULTS[('in_charge',)]['attached_to'], created = \ + models.Organization.objects.get_or_create(name='SRA Pays de la Loire', + defaults={ + 'organization_type':OrganizationType.objects.get( + txt_idx='sra')}) self._init_line_format() if tuple() not in self._defaults: self._defaults[tuple()] = {} self._defaults[tuple()]['history_modifier'] = self.history_modifier def test(filename): - importer = FileImporterSraPdL(skip_first_line=True) + importer = FileImporterSraPdL(skip_first_line=True, output=True) with open(filename) as csv_file: encodings = [settings.ENCODING, settings.ALT_ENCODING, 'utf-8'] for encoding in encodings: |