Changeset 1844

Timestamp:

2 Jun 2007, 09:15:52 (18 years ago)

Author:

Henrik Bettermann

Message:

ticket #244

File:

• WAeUP_SRP/trunk/WAeUPTool.py (modified) (2 diffs)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -815 +815 @@
               jamb_reg_no != res[0].jamb_reg_no:
                 return '%s' % res[0].id ,"student has no jamb_reg_no %s" % jamb_reg_no
+        elif jamb_reg_no:
+            res = self.students_catalog(jamb_reg_no = jamb_reg_no)
+            if not res:
+                return '',"no student with jamb_reg_no %s" % jamb_reg_no
         elif matric_no:
             res = self.students_catalog(matric_no = matric_no)
             if not res:
                 return '',"no student with matric_no %s" % matric_no
-            elif jamb_reg_no and res[0].jamb_reg_no and\
-              jamb_reg_no != res[0].jamb_reg_no:
-                return '%s' % res[0].id ,"student has no jamb_reg_no %s" % jamb_reg_no
-        elif jamb_reg_no:
-            res = self.students_catalog(jamb_reg_no = jamb_reg_no)
-            if not res:
-                return '',"no student with jamb_reg_no %s" % jamb_reg_no
+            #elif jamb_reg_no and res[0].jamb_reg_no and\
+            #  jamb_reg_no != res[0].jamb_reg_no:
+            #    return '%s' % res[0].id ,"student has no jamb_reg_no %s" % jamb_reg_no
+
         sid = res[0].id
         student_obj = getattr(students_folder,sid)
@@ -845 +846 @@
             d['Title'] = f2t[pt]['title']
             for field in f2t[pt]['fields']:
+                if not mapping.get(field,None):
+                    continue
                 d[field] = mapping.get(field,'')
             sub_doc.edit(mapping = d)