Changeset 8996

Timestamp:

13 Jul 2012, 10:52:33 (12 years ago)

Author:

Henrik Bettermann

Message:

Derive all Processors from FacultyProcessor? to reuse updateEntry and checkConversion.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/university

Files:

• batching.py (modified) (10 diffs)
• course.py (modified) (1 diff)

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

@@ -36 +36 @@
     IFacultiesContainer, IFaculty, ICourse, IDepartment, ICertificate,
     ICertificateCourse)
-from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university import (
+    Faculty, Department, Course, Certificate)
 from waeup.kofa.utils.batching import BatchProcessor
 
@@ -64 +65 @@
         fields = getFields(self.iface)
         return sorted(list(set(
-            ['local_roles'] + fields.keys())))
+            self.location_fields + fields.keys() + ['local_roles']
+            )))
 
     def entryExists(self, row, site):
@@ -147 +149 @@
         return errs, inv_errs, conv_dict
 
-class DepartmentProcessor(BatchProcessor):
+class DepartmentProcessor(FacultyProcessor):
     """A batch processor for IDepartment objects.
     """
@@ -158 +160 @@
     name = u'Department Processor'
     iface = IDepartment
+    allowed_roles = Department.local_roles
 
     location_fields = ['code', 'faculty_code']
@@ -194 +197 @@
         return
 
-class CourseProcessor(BatchProcessor):
+class CourseProcessor(FacultyProcessor):
     """A batch processor for ICourse objects.
     """
@@ -205 +208 @@
     name = u'Course Processor'
     iface = ICourse
+    allowed_roles = Course.local_roles
 
     location_fields = ['code', 'faculty_code', 'department_code']
@@ -245 +249 @@
         return
 
-class CertificateProcessor(BatchProcessor):
+class CertificateProcessor(FacultyProcessor):
     """A batch processor for ICertificate objects.
     """
@@ -256 +260 @@
     name = u'Certificate Processor'
     iface = ICertificate
+    allowed_roles = Certificate.local_roles
 
     location_fields = ['code']
@@ -266 +271 @@
         fields = getFields(self.iface)
         return sorted(list(set(
-            ['faculty_code','department_code'] + fields.keys())))
+            ['faculty_code','department_code'] + fields.keys()
+            + ['local_roles'])))
 
     def checkHeaders(self, headerfields, mode='create'):
@@ -339 +345 @@
         return
 
-class CertificateCourseProcessor(BatchProcessor):
+class CertificateCourseProcessor(FacultyProcessor):
     """A batch processor for ICertificateCourse objects.
     """

main/waeup.kofa/trunk/src/waeup/kofa/university/course.py

@@ -29 +29 @@
     """
     grok.implements(ICourse, ICourseAdd)
+
+    local_roles = []
 
     def __init__(self,