From ee5a59601cbd02d43d9c95a51b435688ee298735 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 27 Jul 2017 12:12:30 +0200 Subject: Year limit is now 1000 --- archaeological_operations/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archaeological_operations/utils.py') diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index 40ca71c05..8afbb3be8 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -256,7 +256,7 @@ def parse_year(value): yr = int(value) except ValueError: return None - if yr < 1600 or yr > 2100: + if yr < 1000 or yr > 2100: return None return yr -- cgit v1.2.3 From b2e1c602627102d2c63616d98305941c773b24fa Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 30 Jul 2017 23:13:28 +0200 Subject: Data importer: allow many split for UnicodeFormater --- archaeological_operations/utils.py | 2 +- ishtar_common/data_importer.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'archaeological_operations/utils.py') diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index 8afbb3be8..3a5057cd5 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -268,7 +268,7 @@ def parse_trunc_patriarche(value): value = value.replace(' ', '') try: int(value) - except: + except ValueError: return return '18' + unicode(value) diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 3bb65fc21..2ab5ba28f 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -156,7 +156,7 @@ class ChoiceChecker(object): class UnicodeFormater(Formater): def __init__(self, max_length=None, clean=False, re_filter=None, notnull=False, prefix=u'', db_target=None, - import_instance=None): + import_instance=None, many_split=None): self.max_length = max_length self.db_target = db_target self.clean = clean @@ -164,6 +164,7 @@ class UnicodeFormater(Formater): self.notnull = notnull self.prefix = prefix self.import_instance = import_instance + self.many_split = many_split def format(self, value): try: -- cgit v1.2.3