Index: /WAeUP_SRP/trunk/skins/waeup_utilities/createReturningStudent.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_utilities/createReturningStudent.py	(revision 1259)
+++ /WAeUP_SRP/trunk/skins/waeup_utilities/createReturningStudent.py	(revision 1260)
@@ -33,23 +33,35 @@
     return "Student MatricNo %s, StudentId %s Jamb %s created" % (matric_no,sid,jamb_reg_no)
 
-students = context.returning_import(emil="adf")
+matric_nos = context.returning_import.uniqueValuesFor('matric_no')
 count = 1
 total = 0
 logger.info('"%s","Create Students start"' % (member))
-#from Products.zdb import set_trace;set_trace()
-for student in students:
-    if context.students_catalog(matric_no=student.matric_no):
-        logger.info('"Student already exists","%s"' % (student.matric_no))
+letters = ('ABCDEFGHKLMNPQRSTUVWXYZ')
+lc = 0
+for matric_no in matric_nos:
+    res = context.students_catalog(matric_no = matric_no)
+    if len(res) == 1:
+        #logger.info('"Student already exists","%s"' % (matric_no))
         continue
-    if count > 100:
-        context.waeup_tool.createOne(students_folder,student,'Z',commit=True)
+    elif len(res) > 1:
+        logger.info('"Student with multiple entries","%s","%s" ' % (matric_no,len(res)))
+        ids = [r.id for r in res if not r.id.startswith('A')]
+        #from Products.zdb import set_trace;set_trace()
+        for id in ids:
+            context.students_catalog.deleteRecord(id)
+        students_folder.manage_delObjects(ids)
+        logger.info('"deleted students","%s" ' % " ".join(ids))
+        continue
+    student = context.returning_import(matric_no=matric_no)[0]
+    letter = letters[lc]
+    lc += 1
+    if lc == len(letters):
+        lc = 0
+    context.waeup_tool.createOne(students_folder,student,letter)
+    logger.info('"Student created","%s"' % (matric_no))
+    count += 1
+    if count > 10:
         logger.info('"%s","Committed Students","%s", "%s" ' % (member,count,total))
         total += count
         count = 1
-        if total > 500:
-            break
-    else:
-        for letter in ('ABCDEFGHKLMNPQRSTUVWXY'):
-            context.waeup_tool.createOne(students_folder,student,letter)
-            count += 1
 logger.info('"%s","Create Students finish","%s"' % (member,total))
