Changeset 7264

Timestamp:

4 Dec 2011, 13:34:26 (13 years ago)

Author:

uli

Message:

Fix importer semantics. Methods named like booleans (entryExists)
should return boolean values.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/batching.py (modified) (3 diffs)

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

@@ -97 +97 @@
 
     def entryExists(self, row, site):
-        if not self.parentsExist(row, site):
-            return None
-        parent = self.getParent(row, site)
-        if 'application_number' in row.keys() and row['application_number']:
-            if row['application_number'] in parent.keys():
-                return parent[row['application_number']]
-        return None
+        return self.getEntry(row, site) is not None
 
     def getParent(self, row, site):
@@ -109 +103 @@
 
     def getEntry(self, row, site):
-        return self.entryExists(row, site)
+        if not self.parentsExist(row, site):
+            return None
+        parent = self.getParent(row, site)
+        return parent.get(row.get('application_number', None), None)
 
     def addEntry(self, obj, row, site):
@@ -117 +114 @@
 
     def delEntry(self, row, site):
-        applicant = self.entryExists(row, site)
-        if applicant is not None:
+        if self.entryExists(row, site):
             parent = self.getParent(row, site)
             del parent[row['application_number']]