Changeset 4894

Timestamp:

27 Jan 2010, 11:29:30 (15 years ago)

Author:

uli

Message:

Return the set paths of created files after processing.

File:

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

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

@@ -235 +235 @@
 
         (base, ext) = os.path.splitext(path)
-        failed_path = "%s.%s.pending%s" % (base, mode, ext)
+        failed_path = "%s.pending%s" % (base, ext)
         failed_headers = [x for x in mapping.values()]
         failed_headers.append('--ERRORS--')
@@ -242 +242 @@
         failed_writer.writerow(dict([(x,x) for x in failed_headers]))
 
-        finished_path = "%s.%s.finished%s" % (base, mode, ext)
+        finished_path = "%s.finished%s" % (base, ext)
         finished_headers = [x for x in mapping.values()]
         finished_writer = csv.DictWriter(open(finished_path, 'wb'),
@@ -306 +306 @@
         self.createLogfile(path, failed_path, num, num_warns, mode, user,
                            timedelta, logger=logger)
+        failed_path = os.path.abspath(failed_path)
         if num_warns == 0:
             del failed_writer
             os.unlink(failed_path)
-        return (num, num_warns)
+            failed_path = None
+        return (num, num_warns,
+                os.path.abspath(finished_path), failed_path)
 
 class FacultyProcessor(BatchProcessor):