Changeset 4878

Timestamp:

23 Jan 2010, 08:33:21 (15 years ago)

Author:

uli

Message:

• Don't display errors in logfiles any more (they are added in .pending files instead).

• Rename 'warnings' to 'warn_num'.

File:

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

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

@@ -201 +201 @@
                 timedelta, timedelta/(num or 1)))
         fd.write("Processed: %s lines (%s successful/ %s failed)\n" % (
-                num, num - len(warnings), len(warnings)
+                num, num - warnings, warnings
                 ))
-        fd.write("-" * 70 + '\n')
-        failnum = 1
-        for linenum, text in sorted(warnings.items()):
-            fd.write("line %s (%s): %s\n" % (failnum, linenum, text))
-            failnum += 1
-        fd.close()
         return
 
@@ -240 +234 @@
         failed_writer.writerow(dict([(x,x) for x in failed_headers]))
         
-        warnings = dict()
         num =0
+        num_warns = 0
         site = grok.getSite()
         for raw_row in reader:
@@ -249 +243 @@
                 copy.deepcopy(string_row), converters)
             if len(conv_warnings):
-                warnings[num] = ', '.join(conv_warnings)
+                num_warns += 1
                 self.writeFailedRow(failed_writer, string_row, conv_warnings)
-                #failed_writer.writerow(string_row)
                 continue
                 
             if mode == 'create':
                 if not self.parentsExist(row, site):
-                    warnings[num] = "Not all parents do exist yet. Skipping"
+                    num_warns += 1
                     self.writeFailedRow(
                         failed_writer, string_row,
@@ -262 +255 @@
                     continue
                 if self.entryExists(row, site):
-                    warnings[num] = 'This object already exists. Skipping.'
+                    num_warns += 1
                     self.writeFailedRow(
                         failed_writer, string_row,
@@ -273 +266 @@
             elif mode == 'remove':
                 if not self.entryExists(row, site):
-                    warnings[num] = "Cannot remove: no such entry."
+                    num_warns += 1
                     self.writeFailedRow(
                         failed_writer, string_row,
@@ -282 +275 @@
                 obj = self.getEntry(row, site)
                 if obj is None:
-                    warnings[num] = "Cannot update: no such entry."
+                    num_warns += 1
                     self.writeFailedRow(
                         failed_writer, string_row,
@@ -296 +289 @@
             os.rename(failed_path, path)
             failed_path = path
-        self.createLogfile(path, failed_path, num, warnings, mode, user,
+        self.createLogfile(path, failed_path, num, num_warns, mode, user,
                            timedelta)
-        if len(warnings) == 0:
+        if num_warns == 0:
             del failed_writer
             os.unlink(failed_path)
-        return (num, warnings)
+        return (num, num_warns)
 
 class FacultyProcessor(BatchProcessor):