Index: /WAeUP_SRP/trunk/skins/waeup_utilities/getFromData_entry_mode.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_utilities/getFromData_entry_mode.py	(revision 1388)
+++ /WAeUP_SRP/trunk/skins/waeup_utilities/getFromData_entry_mode.py	(revision 1389)
@@ -18,8 +18,9 @@
 app = getattr(student,'application',None)
 if app is None:
-    return None
+    return "nyr"
 #from Products.zdb import set_trace;set_trace()
 em = app.getContent().entry_mode
 if em:
     return em
-return "None"
+return "none"
+
Index: /WAeUP_SRP/trunk/skins/waeup_utilities/reindex_entry_mode.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_utilities/reindex_entry_mode.py	(revision 1388)
+++ /WAeUP_SRP/trunk/skins/waeup_utilities/reindex_entry_mode.py	(revision 1389)
@@ -31,43 +31,34 @@
 sbrains = cat()
 count = 0
-lc = 1
-rwrite("%3d " % lc)
+
 for sb in sbrains:
     normalized = False
     em = context.getFromData_entry_mode(sb.id)
     ec = 'x'
-    if em is None:
-        ec = 'n'
-        em = 'None'
     if em in ('UME','DE'):
-        ec = 'C'
-        normalized = True
-    elif sb.entry_mode in ('DIRECT', 'DIRECT ENTRY',):
-        ec = 'D'
-        em = 'DE'
-        normalized = True
-    elif sb.entry_mode in ('U.M.E', 'UNE',):
-        ec = 'U'
-        em ="UME"
-        normalized = True
-    elif not sb.entry_mode:
-        ec = 'u'
-        em ="UME"
-        normalized = True
-    if ec != "C" and em != sb.entry_mode:
-        #from Products.zdb import set_trace;set_trace()
-        app = getattr(getattr(students,sb.id),'application',None)
-        ec = 'a'
-        if app is not None:
-            ec = 'A'
-            app.getContent().edit(mapping={'entry_mode': sb.entry_mode})
-    if normalized:
-        cat.modifyRecord(id = sb.id,
-                         entry_mode = em)
-    rwrite(ec)
-    count += 1
-    if count > 60:
-        lc += 1
-        rwrite("<br />\n%3d " % lc)
-        count = 0
+        ec = 'cu'
+        #cat.modifyRecord(id = sb.id,entry_mode = em)
+        rwrite(ec +"--"+ sb.id +"--"+ em +"<br />")
+    else:
+        ret = context.returning_import(matric_no=sb.matric_no)
+        moe = ret[0].Mode_of_Entry
+        if moe in ('DE','DIRECT', 'DIRECT ENTRY',):
+            ec = 'de'
+            new_em = 'DE'
+        elif moe in ('UME','U.M.E', 'UNE',):
+            ec = 'um'
+            new_em ="UME"
+        else:
+            ec = 'un'
+            new_em = 'unknown'
+            moe = 'none'
 
+        #app = getattr(getattr(students,sb.id),'application',None)
+        #if app is not None:
+            #app.getContent().edit(mapping={'entry_mode': new_em})
+            #cat.modifyRecord(id = sb.id,entry_mode = new_em)
+        #else:
+            #cat.modifyRecord(id = sb.id,entry_mode = None)
+            
+        rwrite(ec +"--"+ sb.id +"--"+ em +"--"+ moe +"--"+ new_em +"<br />")
+
