Changeset 3404 for WAeUP_SRP/base

Timestamp:

1 Apr 2008, 20:15:01 (16 years ago)

Author:

Henrik Bettermann

Message:

correct logging message

Also jamb_reg_nos must be unique, condtion added.

File:

• WAeUP_SRP/base/WAeUPImport.py (modified) (3 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -772 +772 @@
                 res = self.students_catalog(jamb_reg_no = jamb_reg_no)
                 if res:
-                    msg = "jamb_reg_no exists for student %s" % res[0].id
+                    msg = "jamb_reg_no already assigned to student %s" % res[0].id
                     break
             if matric_no:
                 res = self.students_catalog(matric_no = matric_no)
                 if res:
-                    msg = "matric_no exists for student %s" % res[0].id
+                    msg = "matric_no already assigned to student %s" % res[0].id
                     break
             if not matric_no and not jamb_reg_no:
@@ -846 +846 @@
                         res = self.students_catalog(matric_no = matric_no)
                         if res:
-                            msg = "matric_no exists for student %s" % res[0].id
+                            msg = "matric_no already assigned to student %s" % res[0].id
                             break
                         msg = "old matric_no %s overwritten with %s" % (student_record.matric_no,matric_no)
@@ -852 +852 @@
                 if jamb_reg_no and student_record.jamb_reg_no:
                     if jamb_reg_no != student_record.jamb_reg_no:
-                        msg = "old reg_no %s overwritten with %s" % (student_record.jamb_reg_no,jamb_reg_no)
+                        res = self.students_catalog(jamb_reg_no = jamb_reg_no)
+                        if res:
+                            msg = "jamb_reg_no already assigned to student %s" % res[0].id
+                            break                    
+                        msg = "old jamb_reg_no %s overwritten with %s" % (student_record.jamb_reg_no,jamb_reg_no)
                         #logger.info("%s, old reg_no %s overwritten with %s" % (student_record.id,student_record.jamb_reg_no,jamb_reg_no))
             elif jamb_reg_no: