Changeset 6245 for main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.py

Timestamp:

30 May 2011, 07:41:18 (13 years ago)

Author:

Henrik Bettermann

Message:

Use and raise DuplicationError? for Courses too.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.py (modified) (2 diffs)

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

@@ -5 +5 @@
 from zope.component.interfaces import IFactory, ComponentLookupError
 from zope.catalog.interfaces import ICatalog
-from zope.component import getUtility
+from zope.component import queryUtility
+from waeup.sirp.interfaces import DuplicationError
 from waeup.sirp.university.interfaces import ICourseContainer, ICourse
 
@@ -14 +15 @@
     grok.require('waeup.manageUniversity')
 
-    def addCourse(self, course):
-        """Add a course.
+    def __setitem__(self, name, course):
+        """See corresponding docstring in certificatecontainer.py.
         """
         if not ICourse.providedBy(course):
-            raise TypeError('CourseContainers contain only ICourse instances')
-        try:
-            cat = getUtility(ICatalog, name='courses_catalog')
-        except ComponentLookupError:
-            # catalog not available. This might happen during tests.
-            self[course.code] = course
-            return 'Course added (for tests only).'
-        results = list(cat.searchResults(code=(course.code,course.code)))
-        if results:
-            dep = results[0].__parent__.__parent__.longtitle()
-            fac = results[0].__parent__.__parent__.__parent__.longtitle()
-            return 'Course exists already in %s / %s.' % (fac,dep)
-        self[course.code] = course
-        return 'Course added.'
+            raise TypeError('CourseContainers contain only '
+                            'ICourse instances')
+
+        # Only accept courses with code == key.
+        if course.code != name:
+            raise ValueError('key must match course code: '
+                             '%s, %s' % (name, course.code))
+
+        # Lookup catalog. If we find none: no duplicates possible.
+        cat = queryUtility(ICatalog, name='courses_catalog', default=None)
+        if cat is not None:
+            entries = cat.searchResults(
+                code=(course.code,course.code))
+            if len(entries) > 0:
+                raise DuplicationError(
+                    'Course exists already elsewhere.', entries)
+        else:
+            # No catalog, then this addition won't do harm to anything.
+            pass
+        super(CourseContainer, self).__setitem__(name, course)
+
+    def addCourse(self, course):
+        """See corresponding docstring in certificatecontainer.py.
+        """
+        self[getattr(course, 'code', None)] = course
 
     def clear(self):
-        """Remove all objects from course container.
+        """See corresponding docstring and comments in certificatecontainer.py.
         """
-        keys = self.keys()
-        for key in keys:
-            del self[key]
+        self._SampleContainer__data.clear()
+        del self.__dict__['_BTreeContainer__len']
 
 class CourseContainerFactory(grok.GlobalUtility):