Changeset 6628

Timestamp:

25 Aug 2011, 16:21:25 (13 years ago)

Author:

uli

Message:

Add missing pieces for implementing interfaces correctly.
Fix one bug detected by tests.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/university/batching.py (modified) (14 diffs)

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

@@ -18 +18 @@
     """A batch processor for IFaculty objects.
     """
+    grok.implements(IBatchProcessor)
     grok.provides(IBatchProcessor)
     grok.context(Interface)
@@ -29 +30 @@
     factory_name = 'waeup.Faculty'
 
+    mode = None
+
     def parentsExist(self, row, site):
         return 'faculties' in site.keys()
@@ -43 +46 @@
         parent = self.getParent(row, site)
         return parent.get(row['code'])
-    
+
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
@@ -57 +60 @@
     """A batch processor for IDepartment objects.
     """
+    grok.implements(IBatchProcessor)
     grok.provides(IBatchProcessor)
     grok.context(Interface)
@@ -68 +72 @@
     factory_name = 'waeup.Department'
 
+    mode = None
+
     def parentsExist(self, row, site):
         if not 'faculties' in site.keys():
@@ -87 +93 @@
         parent = self.getParent(row, site)
         return parent.get(row['code'])
-    
+
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
@@ -101 +107 @@
     """A batch processor for ICourse objects.
     """
+    grok.implements(IBatchProcessor)
     grok.provides(IBatchProcessor)
     grok.context(Interface)
@@ -112 +119 @@
     factory_name = 'waeup.Course'
 
+    mode = None
+
     def parentsExist(self, row, site):
         if not 'faculties' in site.keys():
@@ -135 +144 @@
         parent = self.getParent(row, site)
         return parent.get(row['code'])
-    
+
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
@@ -149 +158 @@
     """A batch processor for ICertificate objects.
     """
+    grok.implements(IBatchProcessor)
     grok.provides(IBatchProcessor)
     grok.context(Interface)
@@ -160 +170 @@
     factory_name = 'waeup.Certificate'
 
+    mode = None
+
     def parentsExist(self, row, site):
         if not 'faculties' in site.keys():
@@ -197 +209 @@
     """A batch processor for ICertificateCourse objects.
     """
+    grok.implements(IBatchProcessor)
     grok.provides(IBatchProcessor)
     grok.context(Interface)
@@ -209 +222 @@
     factory_name = 'waeup.CertificateCourse'
 
+    mode = None
+
     def parentsExist(self, row, site):
         if not 'faculties' in site.keys():
@@ -235 +250 @@
             return None
         parent = self.getParent(row, site)
-        return parent.get(row['course'])
+        return parent.get("%s_%s" % (row['course'].code, row['level']))
 
     def addEntry(self, obj, row, site):