Changeset 3053 for WAeUP_SRP/base

Timestamp:

28 Jan 2008, 08:13:22 (17 years ago)

Author:

Henrik Bettermann

Message:

fix some error messages

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -1613 +1613 @@
         res = self.students_catalog.evalAdvancedQuery(query)
         if not res:
-            return '', "No student with %(id_field)s: %(id_key)s" % vars()
+            return '', "No student with %(id_key)s %(id_field)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()
+            return '', "No student with %(id_key)s %(id_field)s" % vars()
         student_rec = res[0]
         student_id = student_rec.id
@@ -1938 +1938 @@
             if matric_no and student_record.matric_no and\
               matric_no != student_record.matric_no:
-                return '', 'student %s matric_no %s does not match %s' % (student_record.id,
+                return '', 'student %s: matric_no %s does not match %s' % (student_record.id,
                                                                           student_record.matric_no,
                                                                           matric_no)
@@ -1960 +1960 @@
         current_session = mapping.get('current_session','')
         if current_session and student_record.session != current_session:
-            return '','student_id: %s imported session %s does not match current_session %s' % (student_id,
+            return '','student %s: imported session %s does not match current_session %s' % (student_id,
                                                                                         current_session,
                                                                                         student_record.session)
@@ -1966 +1966 @@
         current_level = mapping.get('current_level','')
         if current_level and student_record.level != current_level:
-            return '','student_id %s: imported level %s does not match current_level %s' % (student_id,
+            return '','student %s: imported level %s does not match current_level %s' % (student_id,
                                                                                     current_level,
                                                                                     student_record.level)
         study_course_obj = getattr(student_obj,'study_course',None)
         if study_course_obj is None:
-            return '','student_id %s: no study_course object' % student_id
+            return '','student %s: no study_course object' % student_id
         level_obj = getattr(study_course_obj,current_level,None)
         if  level_obj is None:
-            return '','student_id %s: no study_level object for level %s' % (student_id,
+            return '','student %s: no study_level object for level %s' % (student_id,
                                                                              current_level)
         verdict = d['verdict'] = d['current_verdict']  = mapping.get('current_verdict','')
         if verdict == student_record.verdict:
-            return '','student_id %s: verdict already set to %s' % (student_id,
+            return '','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":
-            return '','student_id %s: level %s is not closed' % (student_id,
+            return '','student %s: level %s is not closed' % (student_id,
                                                                  current_level)