Changeset 6831 for main

Timestamp:

29 Sep 2011, 07:54:36 (13 years ago)

Author:

Henrik Bettermann

Message:

We use the same headers for failed and finished files. Both files get the modified headers not the original headers which were obviously wrong.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py (modified) (1 diff)

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

@@ -230 +230 @@
         (base, ext) = os.path.splitext(base)
         failed_path = os.path.join(temp_dir, "%s.pending%s" % (base, ext))
-        failed_headers = mapping.keys()
+        failed_headers = mapping.values()
         failed_headers.append('--ERRORS--')
         failed_writer = csv.DictWriter(open(failed_path, 'wb'),
                                        failed_headers)
-        first_row = mapping.items()
-        first_row.append(("--ERRORS--", "--ERRORS--"),)
-        failed_writer.writerow(dict(first_row))
+        failed_writer.writerow(dict([(x,x) for x in failed_headers]))
 
         finished_path = os.path.join(temp_dir, "%s.finished%s" % (base, ext))
-        finished_headers = [x for x in mapping.values()]
+        finished_headers = mapping.values()
         finished_writer = csv.DictWriter(open(finished_path, 'wb'),
                                          finished_headers)