Index: /WAeUP_SRP/base/skins/waeup_utilities/ti_441_resolve_part1.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_utilities/ti_441_resolve_part1.py	(revision 3008)
+++ /WAeUP_SRP/base/skins/waeup_utilities/ti_441_resolve_part1.py	(revision 3009)
@@ -39,27 +39,5 @@
     response.write("%s<br>\n\r" % s)
 
-def getLGAs():
-    voc = getattr(context.portal_vocabularies,'local_gov_areas')
-    states = []
-    lgas  = []
-    d = {}
-    for k,v in voc.items():
-        parts = v.split(' / ')
-        if len(parts) == 1:
-            state = parts[0].lower()
-            lga = ""
-        elif len(parts) == 2:
-            state = parts[0].lower()
-            lga = "_".join(parts[1].lower().split())
-        else:
-            continue
-        if state not in states:
-            states.append(state)
-        if lga not in lgas:
-            lgas.append(lga)
-        d[k] = v
-    return (d,states,lgas)
-
-#logger.info('')
+re_split = context.waeup_tool.re_split
 query = Eq('lga','')
 student_records = aq_students(query)
@@ -69,21 +47,38 @@
 commit_after = 100
 logger.info('started to fix %d records' % total)
-d,states,lgas = getLGAs()
+mapping = context.waeup_tool.getStatesLgas()
+states = mapping['states']
+lgas = mapping['lgas']
+words_dict = mapping['word_dict']
 d = {}
 for student_record in student_records:
     count += 1
-    if len(d) and not len(d)  % commit_after:
-        logger.info("found %d correct lga values of %d so far" % (len(d),count))
     jamb_state = getattr(getattr(students_folder,student_record.id),'application').getContent().jamb_state
     jamb_lga = getattr(getattr(students_folder,student_record.id),'application').getContent().jamb_lga
-    jamb_state = jamb_state.lower()
-    jamb_lga = jamb_lga.lower()
-    lga = jamb_state + '_' + jamb_lga
-    if jamb_state and jamb_lga and jamb_state in states and jamb_lga in lgas:
-        d[student_record.id] = lga
-    #else:
-    #    msg = "no %s for %s" % (lga,student_record.id)
-    #    pass
-    # rwrite(msg)
+    words = ' '.join((jamb_state, jamb_lga))
+    words = re_split('[^a-zA-Z0-9/]',words)
+    lga_words = []
+    for word in words:
+        if word:
+            lga_words += word.lower(),
+    lga_words.sort()
+    state_lga = ''
+    while not state_lga:
+        for k,l in words_dict.items():
+            if lga_words == l:
+                state_lga = k
+                break
+        break
+    if state_lga:
+        msg = "found %s is %s for %s " % (state_lga,student_record.lga,student_record.id)
+        #rwrite(msg)
+        logger.info(msg)
+        d[student_record.id] = state_lga
+        if len(d) and not len(d)  % commit_after:
+            logger.info("found %d to correct state/lga combinations of %d so far" % (len(d),count))
+    else:
+        msg = "no '%s' for %s" % (lga_words,student_record.id)
+        logger.info(msg)
+        #rwrite(msg)
     # if count > 150:
     #     break
@@ -91,5 +86,5 @@
 edited = 1
 for student_id,lga in d.items():
-    msg = "set clearance.lga to %s for %s" % (lga,student.id)
+    msg = "set clearance.lga to %s for %s" % (lga,student_id)
     getattr(getattr(students_folder,student_id),'clearance').getContent().edit(mapping={'lga':lga})
     logger.info(msg)
