summaryrefslogtreecommitdiff
path: root/archaeological_operations/import_from_csv.py
diff options
context:
space:
mode:
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
commit55859b216d5950beb1ba6565af1cc189976af9fa (patch)
tree422a6c6ce6ef276f18031696106285af04d84068 /archaeological_operations/import_from_csv.py
parent9983e77346ab93fae0fd2775285276682680adef (diff)
downloadIshtar-55859b216d5950beb1ba6565af1cc189976af9fa.tar.bz2
Ishtar-55859b216d5950beb1ba6565af1cc189976af9fa.zip
Operation import: improve period detection
Diffstat (limited to 'archaeological_operations/import_from_csv.py')
-rw-r--r--archaeological_operations/import_from_csv.py4
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: