Context navigation

waeup

Timestamp:

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

Author:

Henrik Bettermann

Message:

Use DuplicationError? exception for batching (data import).

Location:

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

Files:

-                      r6235
+                      r6243
             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>' % (

-                      r6219
+                      r6243
     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):

r6242	r6243
65	65	if len(entries) > 0:
66	66	raise DuplicationError(
67		'Certificate exists already elsewhere', entries)
	67	'Certificate exists already elsewhere.', entries)
68	68	else:
69	69	# No catalog, then this addition won't do harm to anything.

-                      r6219
+                      r6243
 from zope.schema import getFields
 from waeup.sirp.interfaces import (
     IBatchProcessor, ISchemaTypeConverter, FatalCSVError)
+    IBatchProcessor, ISchemaTypeConverter, FatalCSVError, DuplicationError)
 class BatchProcessor(grok.GlobalUtility):
 …
                     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':

Note: See TracChangeset for help on using the changeset viewer.