Changeset 1189

Timestamp:

3 Jan 2007, 18:50:45 (18 years ago)

Author:

joachim

Message:

fix empty matric_no entry

File:

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

WAeUP_SRP/trunk/Widgets.py

@@ -384 +384 @@
         value = datastructure[widget_id].upper()
         err = 0
-        record = datastructure[self.reference]
+        record = datastructure.get(self.reference,None)
         if not valid:
             err = 'Invalid String'
-        elif not record:
+        elif not record or datastructure.errors:
             err = 0
         else:
-            #import pdb;pdb.set_trace()
             found = False
             cvs = []
@@ -429 +428 @@
         results = self.results_import
         err = 0
-        if not valid:
-            value = datastructure[widget_id]
+        widget_id = self.getWidgetId()
+        value = datastructure[widget_id]
+        if not valid or not value:
             err = 'Invalid MatricNo String %s.' % value
-            logger.info('"%s","invalid MatricNo String","%s"' % value)
-        else:
-            widget_id = self.getWidgetId()
-            value = datastructure[widget_id].upper()
+            logger.info('"%s","invalid MatricNo String"' % value)
+        else:
+            value = value.upper()
             datastructure['student'] = None
             while not err:
@@ -450 +449 @@
                 datastructure['results'] = res
                 break
-            if err:
-                datastructure.setError(widget_id, err)
-            else:
-                datamodel = datastructure.getDataModel()
-                datamodel[self.fields[0]] = value
-            return not err
+        if err:
+            datastructure.setError(widget_id, err)
+        else:
+            datamodel = datastructure.getDataModel()
+            datamodel[self.fields[0]] = value
+        return not err
 
 InitializeClass(MatricNoWidget)