Changeset 3185 for WAeUP_SRP/base

Timestamp:

19 Feb 2008, 12:37:16 (17 years ago)

Author:

joachim

Message:

use importe_mode from pending in pending_only mode
M or F for sex in pending and imported
remove digest-column

Location:

WAeUP_SRP/base

Files:

• WAeUPImport.py (modified) (4 diffs)
• WAeUPTool.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -98 +98 @@
         info['import_mode'] = mode
         info['error'] = ''
-        info['digest'] = ''
+        #info['digest'] = ''
         self.info = info
         self.csv_keys.extend(self.info)
@@ -644 +644 @@
         students_folder = self.portal_url.getPortalObject().campus.students
         jamb_reg_no = mapping.get('jamb_reg_no',None)
-        msg = ''
-        student_id = ''
-        while True:
+        matric_no = mapping.get('matric_no',None)
+        msg = ''
+        student_id = mapping.get('id',None)
+        while True:
+            if student_id:
+                msg = "student_id must not be specified in create mode"
+                break
             if jamb_reg_no:
                 res = self.students_catalog(jamb_reg_no = jamb_reg_no)
@@ -652 +656 @@
                     msg = "jamb_reg_no exists"
                     break
-            matric_no = mapping.get('matric_no',None)
             if matric_no:
                 res = self.students_catalog(matric_no = matric_no)
@@ -658 +661 @@
                     msg = "matric_no exists"
                     break
+            if not (matric_no and jamb_reg_no):
+                msg = "jamb_reg_no or matric_no must be specified"
+                break
             student_id = self.waeup_tool.generateStudentId('?')
             students_folder.invokeFactory('Student', student_id)

WAeUP_SRP/base/WAeUPTool.py

@@ -1483 +1483 @@
                                                                            ds.getErrorMapping(k)))
                     error_count += 1
+            if item.has_key('sex'):
+                if item['sex']:
+                    item['sex'] = 'F'
+                else:
+                    item['sex'] = 'M'
             if error_string:
                 error = error_string
@@ -1490 +1495 @@
                 temp_item = item.copy()
                 temp_item.update(dm)
-                results = importer.import_method(temp_item)
+                import_method = importer.import_method
+                if pending_only:
+                    import_mode = temp_item.get('import_mode','edit')
+                    import_method = getattr(importer, '%(import_mode)s' % vars() )
+                    info['import_mode'] = import_mode
+                results = import_method(temp_item)
                 id = results[0]
                 error = results[1]