Changeset 2187

Timestamp:

7 Sep 2007, 15:15:36 (17 years ago)

Author:

joachim

Message:

accept Foreigner as key, add empty key to cos-vocabulary

Location:

WAeUP_SRP/trunk

Files:

• Widgets.py (modified) (1 diff)
• profiles/default/vocabularies/cos.xml (modified) (1 diff)

WAeUP_SRP/trunk/Widgets.py

@@ -492 +492 @@
         for k,v in voc.items():
             parts = v.split(' / ')
-            if len(parts) != 2:
+            if len(parts) == 1:
+                state = parts[0].lower()
+                lga = ""
+            elif len(parts) == 2:
+                state = parts[0].lower()
+                lga = "_".join(re.split('\W+',parts[1].lower()))
+            else:
                 continue
-            state = parts[0].lower()
-            lga = "_".join(re.split('\W+',parts[1].lower()))
             if state not in states:
                 states.append(state)
-            lgas.append(lga)
+            if lga not in lgas:
+                lgas.append(lga)
             d[k] = v
 

WAeUP_SRP/trunk/profiles/default/vocabularies/cos.xml

@@ -7 +7 @@
     <property name="acl_write_roles">Manager</property>
 
+    <item key="" msgid="">N/A</item>
     <item key="None" msgid=""></item>
     <item key="BSCANA" msgid="">B.SC (ANATOMY)</item>