Changeset 4911

Timestamp:

27 Jan 2010, 21:11:21 (15 years ago)

Author:

uli

Message:

Use different logical and written headers for failed_writer. This
enables us to write different values to same-named (--IGNORE--)
columns.

File:

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

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

@@ -239 +239 @@
         (base, ext) = os.path.splitext(path)
         failed_path = os.path.join(temp_dir, "%s.pending%s" % (base, ext))
-        failed_headers = [x for x in mapping.values()]
+        failed_headers = mapping.keys()
         failed_headers.append('--ERRORS--')
         failed_writer = csv.DictWriter(open(failed_path, 'wb'),
                                        failed_headers)
-        failed_writer.writerow(dict([(x,x) for x in failed_headers]))
+        first_row = mapping.items()
+        first_row.append(("--ERRORS--", "--ERRORS--"),)
+        failed_writer.writerow(dict(first_row))
 
         finished_path = os.path.join(temp_dir, "%s.finished%s" % (base, ext))
@@ -261 +263 @@
             if len(conv_warnings):
                 num_warns += 1
-                self.writeFailedRow(failed_writer, string_row, conv_warnings)
+                self.writeFailedRow(failed_writer, raw_row, conv_warnings)
                 continue
                 
@@ -268 +270 @@
                     num_warns += 1
                     self.writeFailedRow(
-                        failed_writer, string_row,
+                        failed_writer, raw_row,
                         "Not all parents do exist yet. Skipping")
                     continue
@@ -274 +276 @@
                     num_warns += 1
                     self.writeFailedRow(
-                        failed_writer, string_row,
+                        failed_writer, raw_row,
                         "This object already exists. Skipping.")
                     continue
@@ -285 +287 @@
                     num_warns += 1
                     self.writeFailedRow(
-                        failed_writer, string_row,
+                        failed_writer, raw_row,
                         "Cannot remove: no such entry.")
                     continue
@@ -294 +296 @@
                     num_warns += 1
                     self.writeFailedRow(
-                        failed_writer, string_row,
+                        failed_writer, raw_row,
                         "Cannot update: no such entry.")
                     continue