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

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/applicants

Files:

• batching.py (modified) (3 diffs)
• tests/test_batching.py (modified) (3 diffs)

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

@@ -221 +221 @@
         pass
 
-    def updateEntry(self, obj, row, site):
+    def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
@@ -264 +264 @@
         # apply other values...
         items_changed += super(ApplicantProcessor, self).updateEntry(
-            obj, row, site)
+            obj, row, site, filename)
 
         # Log actions...
@@ -270 +270 @@
         if self.getLocator(row) == 'container_code':
             parent.__parent__.logger.info(
-                'Applicant imported: %s' % items_changed)
+                '%s - %s - imported: %s' % (self.name, filename, items_changed))
         else:
             parent.__parent__.logger.info(
-                'Applicant updated: %s' % items_changed)
+                '%s - %s - updated: %s' % (self.name, filename, items_changed))
         return items_changed
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py

@@ -304 +304 @@
         # create applicant with given application_number
         self.assertTrue(
-            'Applicant imported: applicant_id=dp2011_1234, password=mypwd1, '
+            'Applicant Processor - sample_applicant_data - imported: '
+            'applicant_id=dp2011_1234, password=mypwd1, '
             'reg_number=1001, firstname=Aaren, middlename=Peter, lastname=Pieri, '
             'sex=m, course1=CERT1, date_of_birth=1990-01-02, email=xx@yy.zz' in
@@ -311 +312 @@
         # not shown in the log file
         self.assertTrue(
-            'Applicant imported: reg_number=1003, firstname=Aaren, '
+            'Applicant Processor - sample_applicant_data - imported: '
+            'reg_number=1003, firstname=Aaren, '
             'middlename=Alfons, lastname=Berson, sex=m, course1=CERT1, '
             'date_of_birth=1990-01-04, email=xx@yy.zz' in
@@ -369 +371 @@
         # reg_number is locator
         self.assertTrue(
-            'Applicant updated: reg_number=1001, firstname=Aaren' in
+            'Applicant Processor - sample_applicant_data_update - updated: '
+            'reg_number=1001, firstname=Aaren' in
             logcontent)
         # applicant_id is locator
         self.assertTrue(
-            'Applicant updated: state=admitted, reg_number=6666, '
+            'Applicant Processor - sample_applicant_data_update - updated: '
+            'state=admitted, reg_number=6666, '
             'firstname=Alfons, applicant_id=dp2011_2345' in
             logcontent)