Changeset 8222

Timestamp:

19 Apr 2012, 15:39:17 (13 years ago)

Author:

uli

Message:

• Fix doImport. Still needs tests.
• Use code in log messages.

File:

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

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

@@ -212 +212 @@
                 continue
             setattr(obj, key, value)
-            changed.append('%s=%s' % (key, value))
+            log_value = getattr(value, 'code', value)
+            changed.append('%s=%s' % (key, log_value))
         return ', '.join(changed)
 
@@ -293 +294 @@
             num += 1
             string_row = self.applyMapping(raw_row, mapping)
+            if ignore_empty and mode in ('update',):
+                # replace empty strings with ignore-markers
+                for key, val in string_row.items():
+                    if val == '':
+                        string_row[key] = IGNORE_MARKER
             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: