Changeset 3179

Timestamp:

18 Feb 2008, 18:09:15 (17 years ago)

Author:

joachim

Message:

fix student import

File:

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

WAeUP_SRP/base/WAeUPImport.py

@@ -227 +227 @@
         if getattr(self,'_v_course_list',None) is None:
             self._v_course_list = []
-        if getattr(self,'_v_departments',None) is None:
-            res = self.portal_catalog(portal_type = "Department")
+        if getattr(self,'_v_department_courses',None) is None:
+            departments = self.portal_catalog(portal_type = "Department")
             self._v_department_courses = {}
-            for d in res:
-                self._v_department_courses[d.getId] = getattr(d.getObject(),"courses",None)
-        did = mapping['department_code']
-        msg = ''
-        while True:
-            d = self._v_department_courses.get(did,None)
-            if d is None:
-                msg =  "No Department with ID: %s" % did
-                break
-            course_id = mapping.get('code')
+            for department in departments:
+                courses_folder = getattr(department.getObject(),"courses",None)
+                if courses_folder is not None:
+                    self._v_department_courses[department.getId] = courses_folder.objectIds() 
+        department_id = mapping['department_code']
+        course_id = mapping.get('code','')
+        msg = ''
+        while True:
+            department_courses = self._v_department_courses.get(department_id,None)
+            if department_courses is None:
+                msg =  "No Department with ID: %(department_id)s" % vars()
+                break
             if course_id in self._v_course_list:
-                msg =  "Duplicate Course ID: %s" % did
-                break
-            c = getattr(d,course_id,None)
-            if c is not None:
-                msg =  "Duplicate Course ID: %s" % did
+                msg =  "Duplicate Course ID: %(course_id)s" % vars()
+                break
+            if course_id in department_courses:
+                msg =  "Course %(course_id)s already exists in department %(department_id)s" % vars()
                 break
             try:
-                d.invokeFactory('Course', course_id)
+                department.invokeFactory('Course', course_id)
             except BadRequest,E:
                 msg =  "%s" % E
                 break
             self._v_course_list.append(course_id)
-            c = getattr(d,course_id)
-            c.getContent().edit(mapping=mapping)
+            course = getattr(department,course_id)
+            course.getContent().edit(mapping=mapping)
             break
         return course_id,msg,mapping
@@ -260 +261 @@
 
     def edit(self,mapping): ###(
-        course_id = mapping.get('code')
+        course_id = mapping.get('code','')
         res = self.portal_catalog(id=course_id)
         while True:
@@ -644 +645 @@
         jamb_reg_no = mapping.get('jamb_reg_no',None)
         msg = ''
+        student_id = ''
         while True:
             if jamb_reg_no:
@@ -694 +696 @@
             self.portal_workflow.doActionFor(student_obj,transition)
             student_obj.manage_setLocalRoles(student_id, ['Owner',])
+            mapping['id'] = student_id
             break
         return student_id,msg,mapping
     ###)
 
-    def edit(self,mapping):
+    def edit(self,mapping): ###(
         wftool = self.portal_workflow
         "edit student records due import"
@@ -815 +818 @@
         return student_id,msg,mapping
     ###)
+###)
 
 class VerdictImport(WAeUPImport):###(