Changeset 6219 for main

Timestamp:

29 May 2011, 10:19:58 (14 years ago)

Author:

Henrik Bettermann

Message:

Use the message output of CertificateContainer?.addCertificate in CertificateProcessor?.addEntry and finally in BatchProcessor?.doImport to notify that the import failed. This can maybe merged with CertificateProcessor?.entryExists?!

Location:

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

Files:

• university/batching.py (modified) (1 diff)
• utils/batching.py (modified) (1 diff)

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

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

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

@@ -279 +279 @@
                     self.writeFailedRow(
                         failed_writer, raw_row,
-                        "This object already exists. Skipping.")
+                        "This object already exists in the same container. Skipping.")
                     continue
                 obj = self.callFactory()
+                #import pdb; pdb.set_trace()
                 for key, value in row.items():
                     setattr(obj, key, value)
-                self.addEntry(obj, row, site)
+                if not self.addEntry(obj, row, site):
+                    num_warns += 1
+                    self.writeFailedRow(
+                        failed_writer, raw_row,
+                        "This object code already exists somewhere else. Skipping.")
+                    continue
             elif mode == 'remove':
                 if not self.entryExists(row, site):