Changeset 8225 for main/waeup.kofa/trunk

Timestamp:

19 Apr 2012, 20:02:24 (13 years ago)

Author:

uli

Message:

Fix StudyLevelImporter?.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -261 +261 @@
 
     def getParent(self, row, site):
+        NON_VALUES = ['', IGNORE_MARKER]
         if not 'students' in site.keys():
             return None
-        if 'student_id' in row.keys() and row['student_id']:
+        if row.get('student_id', '') not in NON_VALUES:
             if row['student_id'] in site['students']:
                 student = site['students'][row['student_id']]
                 return student
-        elif 'reg_number' in row.keys() and row['reg_number']:
+        elif row.get('reg_number', '') not in NON_VALUES:
             reg_number = row['reg_number']
             cat = queryUtility(ICatalog, name='students_catalog')
@@ -274 +275 @@
             if results:
                 return results[0]
-        elif 'matric_number' in row.keys() and row['matric_number']:
+        elif row.get('matric_number', '') not in NON_VALUES:
             matric_number = row['matric_number']
             cat = queryUtility(ICatalog, name='students_catalog')