Changeset 7656 for main/waeup.sirp

Timestamp:

16 Feb 2012, 08:35:53 (13 years ago)

Author:

Henrik Bettermann

Message:

Be more verbose in log messages when creating or updating students or study courses.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py (modified) (5 diffs)

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

@@ -134 +134 @@
         parent = self.getParent(row, site)
         parent.addStudent(obj)
-        # In some tests we don't have a students container
-        try:
-            parent.logger.info('%s - Student record imported' % (
-                obj.student_id))
-            history = IObjectHistory(obj)
-            history.addMessage('Student record imported')
-        except (TypeError, AttributeError):
-            pass
+        # We don't need to log this because is already done by the workflow
+        # transition even handler.
+        history = IObjectHistory(obj)
+        history.addMessage('Student record imported')
         return
 
@@ -148 +144 @@
         if student is not None:
             parent = self.getParent(row, site)
+            parent.logger.info('%s - Student removed' % student.student_id)
             del parent[student.student_id]
         pass
@@ -157 +154 @@
         if row.has_key('student_id') and row['student_id'] is None:
             row.pop('student_id')
+        items_changed = ''
         for key, value in row.items():
             # Set student password and all fields declared in interface.
@@ -168 +166 @@
             elif hasattr(obj, key):
                 setattr(obj, key, value)
+            items_changed += '%s=%s, ' % (key,value)
+        parent = self.getParent(row, site)
+        if hasattr(obj,'student_id'):
+            # Update mode: the student exists and we can get the student_id
+            parent.logger.info(
+                '%s - Student record updated: %s'
+                % (obj.student_id, items_changed))
+        else:
+            # Create mode: the student does not yet exist
+            parent.logger.info('Student data imported: %s' % items_changed)
         return
 
@@ -281 +289 @@
         """Update obj to the values given in row.
         """
+        items_changed = ''
         for key, value in row.items():
             # Skip fields not declared in interface.
             if hasattr(obj, key):
                 setattr(obj, key, value)
+                if key == 'certificate':
+                    value = value.code
+            items_changed += '%s=%s, ' % (key,value)
+        parent = self.getParent(row, site)
+        parent.__parent__.logger.info(
+            '%s - Study course updated: %s'
+            % (parent.student_id, items_changed))
         # Update the students_catalog
         notify(grok.ObjectModifiedEvent(obj.__parent__))