Changeset 6243 for main/waeup.sirp/trunk/src/waeup/sirp/utils

Timestamp:

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

Author:

Henrik Bettermann

Message:

Use DuplicationError? exception for batching (data import).

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py (modified) (2 diffs)

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':