Changeset 8202 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

18 Apr 2012, 05:12:32 (12 years ago)

Author:

Henrik Bettermann

Message:

Empty If no value is provided in import files, attributes must not be cleared. Clear attribute only if value == DELETIONMARKER.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py (modified) (4 diffs)

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

@@ -34 +34 @@
 from waeup.kofa.interfaces import (
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
-    IObjectHistory, VALIDATED)
+    IObjectHistory, VALIDATED, DELETIONMARKER)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.interfaces import (
@@ -168 +168 @@
                 history.addMessage(msg)
             elif hasattr(obj, key):
-                setattr(obj, key, value)
+                # Set attribute to None if value is marked for deletion
+                if value == DELETIONMARKER:
+                    setattr(obj, key, None)
+                elif value is not None:
+                    setattr(obj, key, value)
             items_changed += '%s=%s, ' % (key,value)
         parent = self.getParent(row, site)
@@ -296 +300 @@
             # Skip fields not declared in interface.
             if hasattr(obj, key):
-                setattr(obj, key, value)
-                if key == 'certificate':
-                    value = value.code
+                # Set attribute to None if value is marked for deletion
+                if value == DELETIONMARKER:
+                    setattr(obj, key, None)
+                elif value is not None:
+                    setattr(obj, key, value)
+                    if key == 'certificate':
+                        value = value.code
             items_changed += '%s=%s, ' % (key,value)
         parent = self.getParent(row, site)
@@ -687 +695 @@
             if hasattr(obj, key) and not key in [
                 'current_session','current_level']:
-                setattr(obj, key, value)
+                # Set attribute to None if value is marked for deletion
+                if value == DELETIONMARKER:
+                    setattr(obj, key, None)
+                elif value is not None:
+                    setattr(obj, key, value)
             items_changed += '%s=%s, ' % (key,value)
         parent = self.getParent(row, site)