Changeset 6221

Timestamp:

29 May 2011, 13:34:06 (13 years ago)

Author:

uli

Message:

• Reorder imports.
• Don't use strings to signal status but raise exceptions instead.
• Add a subscriber for certificate addition. This one might be placed better in certificates module in the long run.

This changes break a lot of tests but might take us further towards a
clean implementation.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py (modified) (3 diffs)

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

@@ -2 +2 @@
 """
 import grok
+from zope.catalog.interfaces import ICatalog
+from zope.component.interfaces import IFactory
+from zope.component import queryUtility
+from zope.interface import implementedBy
 from waeup.sirp.university.interfaces import (
     ICertificateContainer, ICertificate)
-from zope.component.interfaces import IFactory, ComponentLookupError
-from zope.catalog.interfaces import ICatalog
-from zope.component import getUtility
-from zope.interface import implementedBy
 
 class CertificateContainer(grok.Container):
@@ -16 +16 @@
 
     def addCertificate(self, certificate):
+        """XXX: docstring missing.
+        """
         if not ICertificate.providedBy(certificate):
             raise TypeError('CertificateContainers contain only '
                             'ICertificate instances')
-        try:
-            cat = getUtility(ICatalog, name='certificates_catalog')
-        except ComponentLookupError:
-            # catalog not available. This might happen during tests.
-            self[certificate.code] = certificate
-            return 'Certificate added (for tests only).'
-        results = list(cat.searchResults(code=(certificate.code,certificate.code)))
-        if results:
-            dep = results[0].__parent__.__parent__.longtitle()
-            fac = results[0].__parent__.__parent__.__parent__.longtitle()
-            return 'Certificate exists already in %s / %s.' % (fac,dep)
+        # Lookup catalog. If we find none: no duplicates possible.
+        cat = queryUtility(ICatalog, name='certificates_catalog', default=None)
+        if cat is not None:
+            entries = cat.searchResults(
+                code=(certificate.code,certificate.code))
+            if len(entries) > 0:
+                raise ValueError('Certificate exists already elsewhere')
+        else:
+            # No catalog, then this addition won't do harm to anything.
+            pass
         self[certificate.code] = certificate
-        return 'Certificate added.'
 
     def clear(self):
@@ -51 +51 @@
     def getInterfaces(self):
         return implementedBy(CertificateContainer)
+
+@grok.subscribe(ICertificate, grok.IObjectAddedEvent)
+def handle_cert_addition(certificate, event):
+    cat = queryUtility(ICatalog, name='certificates_catalog', default=None)
+    if cat is None:
+        return
+    entries = cat.searchResults(
+        code=(certificate.code,certificate.code))
+    if len(entries) == 0:
+        return
+    for entry in entries:
+        if entry is not certificate:
+            # XXX: Evil! We should find a way to block addition _before_
+            #      it actually happens.
+            del certificate.__parent__[certificate.__name__]
+            raise ValueError('Certificate exists already elsewhere: % s' %
+                             (certificate.code, ))
+