Changeset 6243

Timestamp:

30 May 2011, 07:15:54 (13 years ago)

Author:

Henrik Bettermann

Message:

Use DuplicationError? exception for batching (data import).

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/pages.py (modified) (1 diff)
• university/batching.py (modified) (1 diff)
• university/certificatecontainer.py (modified) (1 diff)
• utils/batching.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -1325 +1325 @@
             entries = error.entries
             for entry in entries:
-                # show links to all certs with same code
+                # do not use error.msg but render a more detailed message instead
+                # and show links to all certs with same code
                 message = 'A certificate with same code already exists: '
                 message += '<a href="%s">%s</a>' % (

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

@@ -186 +186 @@
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
-        message = parent.addCertificate(obj)
-        if not message == 'Certificate added.':
-            return False
-        return True
+        parent.addCertificate(obj)
+        return
 
     def delEntry(self, row, site):

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

@@ -65 +65 @@
             if len(entries) > 0:
                 raise DuplicationError(
-                    'Certificate exists already elsewhere', entries)
+                    'Certificate exists already elsewhere.', entries)
         else:
             # No catalog, then this addition won't do harm to anything.

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

@@ -15 +15 @@
 from zope.schema import getFields
 from waeup.sirp.interfaces import (
-    IBatchProcessor, ISchemaTypeConverter, FatalCSVError)
+    IBatchProcessor, ISchemaTypeConverter, FatalCSVError, DuplicationError)
 
 class BatchProcessor(grok.GlobalUtility):
@@ -282 +282 @@
                     continue
                 obj = self.callFactory()
-                #import pdb; pdb.set_trace()
                 for key, value in row.items():
                     setattr(obj, key, value)
-                if not self.addEntry(obj, row, site):
-                    num_warns += 1
-                    self.writeFailedRow(
-                        failed_writer, raw_row,
-                        "This object code already exists somewhere else. Skipping.")
+                try:
+                    self.addEntry(obj, row, site)
+                except DuplicationError, error:
+                    num_warns += 1
+                    self.writeFailedRow(
+                        failed_writer, raw_row,
+                        "%s Skipping." % error.msg)
                     continue
             elif mode == 'remove':