Changeset 2776

Timestamp:

26 Nov 2007, 22:56:37 (17 years ago)

Author:

joachim

Message:

add student_id

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -1456 +1456 @@
             return '', "no student with %(id_key)s %(id_field)s" % vars()
         student_rec = res[0]
-        # if id_field != "student_id":
-        #     mapping['student_id'] = res[0].id
+        if id_field != "student_id":
+            mapping['student_id'] = student_rec.id
         student_id = student_rec.id
         level_id = mapping['level_id']
@@ -1504 +1504 @@
         # if course_id not in self._v_courses.keys():
         #     return '', "No course with ID: %s" % did
-        # id_key = ''
-        # for id_key in ('student_id','matric_no'):
-        #     id_field = mapping.get(id_key,None)
-        #     if id_field is not None:
-        #         student_id = id_field
-        #         break
-        # query = Eq(id_key,id_field)
-        # res = self.students_catalog.evalAdvancedQuery(query)
-        # if not res:
-        #     return '', "No student with %(id_field)s: %(id_key)s" % vars()
-        # if id_field != "student_id":
-        #     mapping['student_id'] = res[0].id
-        students_folder = self.portal_url.getPortalObject().campus.students
-        student_rec = self.students_catalog.getRecordByKey(mapping['student_id'])
-        if student_rec is None:
+        id_key = ''
+        for id_key in ('student_id','matric_no'):
+            id_field = mapping.get(id_key,None)
+            if id_field is not None:
+                student_id = id_field
+                break
+        query = Eq(id_key,id_field)
+        res = self.students_catalog.evalAdvancedQuery(query)
+        if not res:
+            return '', "No student with %(id_field)s: %(id_key)s" % vars()
+        if id_field != "student_id":
+            mapping['student_id'] = res[0].id
+        if not res:
             return '', "no student with %(id_key)s %(id_field)s" % vars()
+        student_rec = res[0]
         student_id = student_rec.id
         level_id = mapping['level_id']