migration: improve geo ethno mapping

git-svn-id: http://svn.parisson.org/svn/crem@128 3bf09e05-f825-4182-b9bc-eedd7160adf0

diff --git a/trunk/import/migration/tasks/items.py b/trunk/import/migration/tasks/items.py
index e11492ae1b1e6b96dbc5f6d5425868efc8032b1b..ece7f613238d19ffec5ed241c9ac0021fe74f8fc 100644 (file)
--- a/trunk/import/migration/tasks/items.py
+++ b/trunk/import/migration/tasks/items.py
@@ -239,6 +239,9 @@ class ItemsLocationsMapper(DataMigrator):
     def parse_location_str(self, str):
         str = re.sub("\*", "", str.strip())
         str = re.sub(" +", " ", str)
+        m = re.match("^(\w+)\s*\(\s*(\w+)\s*\)$", str)
+        if m:
+            return [m.group(1), m.group(2)]
         return re.split(" *[,;/] *", str)
 
     def find_location_by_sequence(self, sequence, matched = None, unmatched = None):