Changeset 4870 for waeup/trunk/src

Timestamp:

21 Jan 2010, 14:56:35 (15 years ago)

Author:

uli

Message:

Make sure that only unconverted rows are written to pending files.

File:

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

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

@@ -5 +5 @@
 """
 import grok
+import copy
 import csv
 import os
@@ -232 +233 @@
             num += 1
             string_row = self.applyMapping(raw_row, mapping)
-            row, conv_warnings = self.convertToTypes(string_row, converters)
+            row, conv_warnings = self.convertToTypes(
+                copy.deepcopy(string_row), converters)
             if len(conv_warnings):
                 warnings[num] = ', '.join(conv_warnings)
-                failed_writer.writerow(row)
+                failed_writer.writerow(string_row)
                 continue
                 
@@ -241 +243 @@
                 if not self.parentsExist(row, site):
                     warnings[num] = "Not all parents do exist yet. Skipping"
-                    failed_writer.writerow(row)
+                    failed_writer.writerow(string_row)
                     continue
                 if self.entryExists(row, site):
                     warnings[num] = 'This object already exists. Skipping.'
-                    failed_writer.writerow(row)
+                    failed_writer.writerow(string_row)
                     continue
                 obj = self.callFactory()
@@ -254 +256 @@
                 if not self.entryExists(row, site):
                     warnings[num] = "Cannot remove: no such entry."
-                    failed_writer.writerow(row)
+                    failed_writer.writerow(string_row)
                     continue
                 self.delEntry(row, site)
@@ -261 +263 @@
                 if obj is None:
                     warnings[num] = "Cannot update: no such entry."
-                    failed_writer.writerow(row)
+                    failed_writer.writerow(string_row)
                     continue
                 self.updateEntry(obj, row, site)