Changeset 3207 for WAeUP_SRP

Timestamp:

23 Feb 2008, 23:04:51 (17 years ago)

Author:

Henrik Bettermann

Message:

wrong boolean logic fixed

File:

• WAeUP_SRP/base/WAeUPImport.py (modified) (11 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -51 +51 @@
 from utils import makeDigest
 
-class WAeUPImport: ###( 
+class WAeUPImport: ###(
     """ WAeUPImport """
     required_modes = ('create',)
@@ -233 +233 @@
                 courses_folder = getattr(department.getObject(),"courses",None)
                 if courses_folder is not None:
-                    self._v_department_courses[department.getId] = courses_folder.objectIds() 
+                    self._v_department_courses[department.getId] = courses_folder.objectIds()
         department_id = mapping['department_code']
         course_id = mapping.get('code','')
@@ -446 +446 @@
     plural_name = "%ss" % name
     commit_after = 1000
-    
+
     def create(self,mapping):###(
         "create a department in the correct faculty"
@@ -550 +550 @@
     plural_name = "%ss" % name
     commit_after = 100
-    
+
     field2types_student = {   ###(
                       'StudentApplication':
@@ -662 +662 @@
                     msg = "matric_no exists"
                     break
-            if not (matric_no and jamb_reg_no):
+            else:
                 msg = "jamb_reg_no or matric_no must be specified"
                 break
@@ -681 +681 @@
                 for field in f2t[pt]['fields']:
                     d[field] = mapping.get(field,'')
-    
+
                 if pt == "StudentApplication":
                     #d['jamb_sex']  = 'M'
@@ -689 +689 @@
                     d['jamb_middlename'] = mapping.get('middlename',None)
                     d['jamb_lastname'] = mapping.get('lastname',None)
-    
+
                 # if pt == "StudyCourse":
                 #     for von,zu in (('entry_mode','current_mode'),
@@ -696 +696 @@
                 #             d[zu] = mapping[von]
                 sub_doc.edit(mapping = d)
-    
+
                 #import pdb;pdb.set_trace()
                 new_state = f2t[pt]['wf_transition_%(transition)s' % vars()]
@@ -833 +833 @@
     commit_after = 100000
     required_modes = ('create','edit')
-    
+
     def edit(self,mapping):
         "edit student verdicts"
@@ -907 +907 @@
                 break
             verdict = d['verdict'] = d['current_verdict']  = mapping.get('current_verdict','')
-    
+
             #if verdict == student_record.verdict:
             #    msg = 'student %s: verdict already set to %s' % (student_id,
             #                                                            verdict)
-    
+
             level_review_state = wftool.getInfoFor(level_obj,'review_state',None)
             if level_review_state != "closed":
@@ -917 +917 @@
                 # msg = 'student %s: level %s is not closed' % (student_id,
                 #                                                      current_level)
-    
+
             study_course_obj.getContent().edit(mapping = d)
             level_obj.getContent().edit(mapping = d)