Changeset 8220 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

19 Apr 2012, 14:19:45 (13 years ago)

Author:

uli

Message:

Clean up basic batch processor and add functionality for changed
interface, especially replacing empty values with IGNORE markers on
updates.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/utils/batching.py (modified) (5 diffs)

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

@@ -39 +39 @@
     This is a non-active baseclass.
     """
-    grok.provides(IBatchProcessor)
+    grok.implements(IBatchProcessor)
     grok.context(Interface)
     grok.baseclass()
@@ -200 +200 @@
     def updateEntry(self, obj, row, site):
         """Update obj to the values given in row.
-        """
+
+        Returns a string describing the fields changed.
+        """
+        changed = []
         for key, value in row.items():
+            # Skip fields to be ignored.
+            if value == IGNORE_MARKER:
+                continue
             # Skip fields not declared in interface.
-            if hasattr(obj, key):
-                # Set attribute to None if value is marked for deletion
-                if value != '<IGNORE>':
-                    setattr(obj, key, value)
-                #if value == DELETIONMARKER:
-                #    setattr(obj, key, None)
-                #elif value is not None:
-                #    setattr(obj, key, value)
-        return
+            if not hasattr(obj, key):
+                continue
+            setattr(obj, key, value)
+            changed.append('%s=%s' % (key, value))
+        return ', '.join(changed)
 
     def createLogfile(self, path, fail_path, num, warnings, mode, user,
@@ -250 +252 @@
         return
 
-    def checkConversion(self, row, mode='ignore'):
+    def checkConversion(self, row, mode='ignore', ignore_empty=True):
         """Validates all values in row.
         """
         converter = IObjectConverter(self.iface)
         errs, inv_errs, conv_dict =  converter.fromStringDict(
-            row, self.factory_name)
+            row, self.factory_name, mode=mode)
         return errs, inv_errs, conv_dict
 
     def doImport(self, path, headerfields, mode='create', user='Unknown',
-                 logger=None):
+                 logger=None, ignore_empty=True):
         """Perform actual import.
         """
@@ -292 +294 @@
             string_row = self.applyMapping(raw_row, mapping)
             row = dict(string_row.items()) # create deep copy
+            if ignore_empty and mode in ('update'):
+                # replace empty strings with ignore-markers
+                for key, val in row.items():
+                    if val == '':
+                        row.update(key=IGNORE_MARKER)
             errs, inv_errs, conv_dict = self.checkConversion(string_row, mode)
             if errs or inv_errs:
@@ -312 +319 @@
                     self.writeFailedRow(
                         failed_writer, string_row,
-                        "This object already exists in the same container. Skipping.")
+                        "This object already exists in the same container. "
+                        "Skipping.")
                     continue
                 obj = self.callFactory()