Changeset 1573 for WAeUP_SRP/trunk/Widgets.py

Timestamp:

17 Mar 2007, 21:43:32 (18 years ago)

Author:

Henrik Bettermann

Message:

logger messages corrected

File:

• WAeUP_SRP/trunk/Widgets.py (modified) (7 diffs)

WAeUP_SRP/trunk/Widgets.py

@@ -370 +370 @@
             name = " ".join(cvs)
             if not found:
-                logger.info('%(matric_no)s mismatch %(value)s not in %(name)s' % vars())
-                err = 'No Name does match.'
+                logger.info('%(matric_no)s did not find %(value)s in %(name)s' % vars())
+                err = 'No name does match.'
             else:
                 logger.info('%(matric_no)s found %(value)s in %(name)s' % vars())
@@ -401 +401 @@
         if not valid or not value:
             err = 'Invalid matric_no string %s.' % value
-            logger.info('%s invalid matric_no string' % value)
+            logger.info('Invalid matric_no string %s' % value)
         else:
             value = value.upper()
@@ -408 +408 @@
                 res = returning(matric_no = value)
                 if len(res) < 1:
-                    logger.info('%s matric_no not found' % value)
-                    err = 'No Student with matric_no %s.' % (value)
+                    logger.info('matric_no %s not found' % value)
+                    err = 'No student with matric_no %s.' % (value)
                     continue
                 datastructure['student'] = res[0]
                 res = results(matric_no = value)
                 if len(res) < 1:
-                    err = 'No Results with matric_no %s.' % (value)
+                    err = 'No results with matric_no %s.' % (value)
                     continue
                 datastructure['results'] = res
@@ -444 +444 @@
         if not valid or not value:
             err = 'Invalid id string %s.' % value
-            logger.info('%s invalid id string' % value)
+            logger.info('Invalid id string %s' % value)
             datastructure['student'] = None
         else:
@@ -450 +450 @@
             res = s_cat(id = value)
             if not res:
-                logger.info('%s id not found' % value)
-                err = 'No Student with StudentId %s.' % (value)
+                logger.info('Student id %s not found' % value)
+                err = 'No student with id %s.' % (value)
                 datastructure['student'] = None
             else:
@@ -721 +721 @@
         elif len(b) > 1 and b.find('-') > -1:
             do = 0
-            err = 'PIN must not contain the "-"'
-            s_logger.info('"%s","Invalid PIN-Number, contains -"' % (s_id))
+            err = 'PIN must not contain "-"'
+            s_logger.info('%s entered invalid PIN  containing "-"' % (s_id))
         elif n.find('-') > -1:
             do = 0
-            err = 'PIN must not contain the "-"'
-            s_logger.info('"%s","Invalid PIN-Number, contains -"' % (s_id))
+            err = 'PIN must not contain "-"'
+            s_logger.info('%s entered invalid PIN  containing "-"' % (s_id))
         elif len(n) != 10:
             do = 0
-            err = 'invalid PIN length %d' % len(n)
-            s_logger.info('%s invalid PIN length %d' % (s_id,len(n)))
+            err = 'Invalid PIN length %d' % len(n)
+            s_logger.info('%s entered invalid PIN with length %d' % (s_id,len(n)))
         elif self.reference == "":
             ref = s_id
@@ -762 +762 @@
                     if self.reference == "jamb_reg_no":
                         err = "You are already logged in."
-                        s_logger.info('%s/%s checked admission though logged in %s' % (s_id,ref,pin_str))
+                        s_logger.info('%s/%s checked admission with PIN %s though logged in' % (s_id,ref,pin_str))
                         break
                     if ok == 1: