Changeset 1727

Timestamp:

2 May 2007, 20:22:26 (18 years ago)

Author:

joachim

Message:

fixed indexing of students_catalog

File:

• WAeUP_SRP/trunk/WAeUPTables.py (modified) (4 diffs)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -485 +485 @@
             student_brain = students[i]
             spath = student_brain.getPath()
-            student_obj = student_brain.getObject()
+            student_object = student_brain.getObject()
             data = {}
             sid = data['id'] = student_brain.getId
@@ -496 +496 @@
                     sub_objects = True
                 except:
+                    #from pdb import set_trace;set_trace()
                     continue
                 for field in self.affected_types[pt]['fields']:
@@ -501 +502 @@
                         data[field] = getattr(self,'get_from_doc_%s' % field)(doc)
                     else:
-                        data[field] = getattr(doc,field)
-                #from pdb import set_trace;set_trace()
-            if not sub_objects and noattr:
+                        data[field] = getattr(doc,field,None)
+            if not sub_objects:
                 import_res = self.returning_import(id = sid)
                 if not import_res:
@@ -514 +514 @@
                                              import_record.Lastname)
                 data['matric_no'] = import_record.Entryregno
-            study_course = getattr(student_obj,'study_course',None)
-            current_level = data.get('level',None)
-            data['registered_courses'] = []
-            if study_course and current_level and current_level in study_course.objectIds():
-                level_obj = getattr(study_course,current_level)
-                courses = [] 
-                for c in level_obj.objectIds():
-                    if c.endswith('_co'):
-                        courses.append(c[:-3])
-                    else:
-                        courses.append(c)
-                data['registered_courses'] = courses 
+            else:
+                study_course = getattr(student_object,'study_course',None)
+                current_level = data.get('level',None)
+                data['registered_courses'] = []
+                if study_course and current_level and current_level in study_course.objectIds():
+                    level_obj = getattr(study_course,current_level)
+                    courses = [] 
+                    for c in level_obj.objectIds():
+                        if c.endswith('_co'):
+                            courses.append(c[:-3])
+                        else:
+                            courses.append(c)
+                    data['registered_courses'] = courses 
             self.addRecord(**data)
         if pghandler: pghandler.finish()