Changeset 1029 for WAeUP_SRP/trunk

Timestamp:

11 Dec 2006, 17:03:34 (18 years ago)

Author:

joachim

Message:

checked error messages,
move unknown error to top with new condition.

File:

• WAeUP_SRP/trunk/Widgets_neu.py (modified) (4 diffs)

WAeUP_SRP/trunk/Widgets_neu.py

@@ -515 +515 @@
         while do:
             ok = pins.searchAndSetRecord(pin,ref,prefix)
-            if ok == -2:
+            if ok < -2 or > 2:
+                err = 'Unknown error, please report!'
+                 s_logger.info('"%s","%s", "caused unknown error with pin", "%s"' % (s_id,ref,pin))
+                break
+            elif ok == -2:
                 err = 'Service already activated but with a different PIN.'
                 s_logger.info('"%s","%s", "repeatedly activated service but with different pin", "%s"' % (s_id,ref,pin))
@@ -522 +526 @@
                 err = 'Invalid PIN'
                  s_logger.info('"%s","%s", "entered invalid pin", "%s"' % (s_id,ref,pin))
-                break
-            elif ok == -3:
-                err = 'Unknown error, please report!'
-                 s_logger.info('"%s","%s", "caused unknown error with pin", "%s"' % (s_id,ref,pin))
                 break
             if ok == 0:
@@ -542 +542 @@
                 else:
                     student = getStudentByRegNo(self,ref)
-                    s_logger.info('"%s","%s","successfully used pin","%s"' % (s_id,ref,pin))      
+                    s_logger.info('"%s","%s","successfully used pin","%s"' % (s_id,ref,pin))
                 if student is None:
                     err = "Student not found."
@@ -560 +560 @@
                         s_logger.info('"%s","%s", "repeatedly activated service with pin", "%s"' % (s_id,ref,pin))   
                         break
-##                if self.reference == "jamb_reg_no":
-##                    res = self.students_catalog(jamb_reg_no = ref)
-##                    if len(res) > 0:
-##                        err = "Please login with your Student Id %s and 10-digit PIN." % s_id
-##                        s_logger.info("Student %s double checked Admission Pin %s" % (s_id,pin))
-##                        break
                 try:
                     student.getContent().makeStudentMember(s_id,password=pin[4:])