diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-07-04 19:20:58 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-07-04 19:20:58 +0200 |
commit | 86af71016af169497d762039ef4b292992dd1a6b (patch) | |
tree | 422a6c6ce6ef276f18031696106285af04d84068 /archaeological_operations/import_from_csv.py | |
parent | d2d6e7c95f161f72aea4117c76d977c700609194 (diff) | |
download | Ishtar-86af71016af169497d762039ef4b292992dd1a6b.tar.bz2 Ishtar-86af71016af169497d762039ef4b292992dd1a6b.zip |
Operation import: improve period detection
Diffstat (limited to 'archaeological_operations/import_from_csv.py')
-rw-r--r-- | archaeological_operations/import_from_csv.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py index d58c0439e..41f322dc4 100644 --- a/archaeological_operations/import_from_csv.py +++ b/archaeological_operations/import_from_csv.py @@ -31,6 +31,7 @@ import re from django.conf import settings from django.contrib.auth.models import User from django.db import transaction +from django.template.defaultfilters import slugify from ishtar_common.models import Town, Person, PersonType, OrganizationType, \ Organization, SourceType @@ -118,7 +119,7 @@ def parse_period(value): period_names = {} for k in settings.ISHTAR_PERIODS.keys(): period = Period.objects.get(txt_idx=settings.ISHTAR_PERIODS[k]) - period_names[period.label] = period + period_names[slugify(period.label)] = period period_names_keys = period_names.keys() period_names_keys.sort(key=len) period_names_keys.reverse() @@ -128,6 +129,7 @@ def parse_period_name(value): if not value: return [period_names[u'']] period, old_val = [], u'' + value = slugify(value) while value and old_val != value: old_val = value for k in period_names_keys: |