Changeset 7534 for main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py

Timestamp:

29 Jan 2012, 08:29:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix logic. entryExists must return True or False, nothing else.

File:

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

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

@@ -268 +268 @@
         return self.getParent(row, site) is not None
 
+
     def entryExists(self, row, site):
+        return self.getEntry(row, site) is not None
+
+    def getEntry(self, row, site):
         student = self.getParent(row, site)
-        if not student:
-            return None
-        if 'studycourse' in student:
-            return student
-        return None
-
-    def getEntry(self, row, site):
-        student = self.entryExists(row, site)
         if not student:
             return None
@@ -301 +297 @@
         # We have to check if current_level is in range of certificate.
         # This is not done by the converter.
-        certificate = conv_dict['certificate']
-        start_level = certificate.start_level
-        end_level = certificate.end_level
-        if conv_dict['current_level'] < start_level or \
-            conv_dict['current_level'] > end_level:
-            errs.append(('current_level','not in range'))
+        if conv_dict.has_key('certificate'):
+          certificate = conv_dict['certificate']
+          start_level = certificate.start_level
+          end_level = certificate.end_level
+          if conv_dict['current_level'] < start_level or \
+              conv_dict['current_level'] > end_level:
+              errs.append(('current_level','not in range'))
         return errs, inv_errs, conv_dict