Changeset 9706 for main/waeup.kofa/trunk/src/waeup/kofa/utils

Timestamp:

21 Nov 2012, 22:37:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Rework logging of batch processing. Remove redundant text but add name of import file.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/utils

Files:

• batching.py (modified) (3 diffs)
• batching.txt (modified) (1 diff)

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

@@ -205 +205 @@
         return None
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
 
@@ -350 +350 @@
                 # student_ids and applicant_ids which have been
                 # generated in the respective __init__ methods before.
-                self.updateEntry(obj, row, site)
+                self.updateEntry(obj, row, site, base)
                 try:
                     self.addEntry(obj, row, site)
@@ -387 +387 @@
                         failed_writer, string_row, update_errors)
                     continue
-                self.updateEntry(obj, row, site)
+                self.updateEntry(obj, row, site, base)
             finished_writer.writerow(string_row)
 

main/waeup.kofa/trunk/src/waeup/kofa/utils/batching.txt

@@ -218 +218 @@
     ...     stoneville[row['name']] = obj
     ...
-    ...   def updateEntry(self, obj, row, site):
+    ...   def updateEntry(self, obj, row, site, filename):
     ...     # This is not strictly necessary, as the default
     ...     # updateEntry method does exactly the same