Changeset 8214

Timestamp:

19 Apr 2012, 12:43:37 (13 years ago)

Author:

uli

Message:

Lots of trash to sketch filtered imports.

Location:

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

Files:

• interfaces.py (modified) (3 diffs)
• students/batching.py (modified) (5 diffs)
• students/tests/sample_student_data_update2.csv (modified) (1 diff)
• utils/batching.py (modified) (2 diffs)
• utils/converters.py (modified) (9 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -37 +37 @@
 _ = MessageFactory = zope.i18nmessageid.MessageFactory('waeup.kofa')
 
-DELETIONMARKER = 'XXX'
+DELETION_MARKER = 'XXX'
+IGNORE_MARKER = '<IGNORE>'
 
 CREATED = 'created'
@@ -825 +826 @@
 
 class IFieldConverter(Interface):
-    def update_request_data(self, name, value, schema_field, prefix=''):
+    def request_data(name, value, schema_field, prefix='', mode='create'):
         """Create a dict with key-value mapping as created by a request.
 
@@ -831 +832 @@
         similar input and represent an attribute to be set to a
         representation of value.
+
+        `mode` gives the mode of import.
 
         :meth:`update_request_data` is then requested to turn this

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

@@ -34 +34 @@
 from waeup.kofa.interfaces import (
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
-    IObjectHistory, VALIDATED, DELETIONMARKER)
+    IObjectHistory, VALIDATED, DELETION_MARKER, IGNORE_MARKER)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.interfaces import (
@@ -169 +169 @@
             elif hasattr(obj, key):
                 # Set attribute to None if value is marked for deletion
-                if value == DELETIONMARKER:
-                    setattr(obj, key, None)
-                elif value is not None:
+                #if value == DELETION_MARKER:
+                #    setattr(obj, key, None)
+                #elif value is not None:
+                #    setattr(obj, key, value)
+                #else:
+                #    # No change, no change log
+                #    continue
+                if value != '<IGNORE>':
                     setattr(obj, key, value)
-                else:
-                    # No change, no change log
-                    continue
-            items_changed += '%s=%s, ' % (key,value)
+                
+                    items_changed += '%s=%s, ' % (key,value)
         parent = self.getParent(row, site)
         if hasattr(obj,'student_id'):
@@ -215 +218 @@
         converter = IObjectConverter(iface)
         errs, inv_errs, conv_dict =  converter.fromStringDict(
-            row, self.factory_name)
+            row, self.factory_name, mode=mode)
         if row.has_key('reg_state') and \
             not row['reg_state'] in IMPORTABLE_STATES:
@@ -304 +307 @@
             if hasattr(obj, key):
                 # 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)
+                setattr(obj, key, value)
+                if key == 'certificate':
+                    value = value.code
+
+                #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)
         parent.__parent__.logger.info(
@@ -698 +705 @@
             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)
+                #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)
         parent.__parent__.logger.info(

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_student_data_update2.csv

@@ -1 +1 @@
 date_of_birth,matric_number,phone
-1970-01-02,100000,
+1970-01-02,100000,<IGNORE>
 1970-01-03,100001,XXX
-1970-01-04,100002,
+1970-01-04,100002,<IGNORE>

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

@@ -32 +32 @@
 from waeup.kofa.interfaces import (
     IBatchProcessor, FatalCSVError, IObjectConverter,
-    ICSVExporter, DELETIONMARKER)
+    ICSVExporter, DELETION_MARKER, IGNORE_MARKER)
 
 class BatchProcessor(grok.GlobalUtility):
@@ -205 +205 @@
             if hasattr(obj, key):
                 # Set attribute to None if value is marked for deletion
-                if value == DELETIONMARKER:
-                    setattr(obj, key, None)
-                elif value is not None:
+                if value != '<IGNORE>':
                     setattr(obj, key, value)
+                #if value == DELETIONMARKER:
+                #    setattr(obj, key, None)
+                #elif value is not None:
+                #    setattr(obj, key, value)
         return
 

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

@@ -30 +30 @@
 from waeup.kofa.interfaces import (
     IObjectConverter, IResultEntryField, IFieldConverter, SubjectSource,
-    GradeSource)
+    GradeSource, DELETION_MARKER, IGNORE_MARKER)
 from waeup.kofa.schema.interfaces import IPhoneNumber
 from waeup.kofa.schoolgrades import ResultEntry
@@ -114 +114 @@
 class DefaultFieldConverter(grok.Adapter):
     grok.context(Interface)
-    grok.provides(IFieldConverter)
-
-    def request_data(self, name, value, schema_field, prefix=''):
+    grok.implements(IFieldConverter)
+
+    def request_data(self, name, value, schema_field, prefix='',
+                     mode='create'):
         return {prefix: value}
 
 class ListFieldConverter(grok.Adapter):
     grok.context(IList)
-    grok.provides(IFieldConverter)
-
-    def request_data(self, name, value, schema_field, prefix=''):
+    grok.implements(IFieldConverter)
+
+    def request_data(self, name, value, schema_field, prefix='',
+                     mode='create'):
         value_type = schema_field.value_type
         try:
@@ -144 +146 @@
     """
     grok.context(IPhoneNumber)
-    grok.provides(IFieldConverter)
-
-    def request_data(self, name, value, schema_field, prefix=''):
+    grok.implements(IFieldConverter)
+
+    def request_data(self, name, value, schema_field, prefix='',
+                     mode='create'):
         parts = value.split('-', 2)
         country = ''
@@ -168 +171 @@
 class ResultEntryConverter(grok.Adapter):
     grok.context(IResultEntryField)
-    grok.provides(IFieldConverter)
-
-    def request_data(self, name, value, schema_field, prefix=''):
+    grok.implements(IFieldConverter)
+
+    def request_data(self, name, value, schema_field, prefix='',
+                     mode='create'):
         """Turn CSV values into ResultEntry-compatible form data.
 
@@ -208 +212 @@
 
     grok.context(Interface)
-    grok.provides(IObjectConverter)
+    grok.implements(IObjectConverter)
 
     def __init__(self, iface):
@@ -217 +221 @@
         return
 
-    def fromStringDict(self, data_dict, context, form_fields=None):
+    def fromStringDict(self, data_dict, context, form_fields=None,
+                       mode='create'):
         """Convert values in `data_dict`.
 
@@ -262 +267 @@
 
         request = TestRequest(form={})
+        new_data = dict()
         for key, val in data_dict.items():
             field = form_fields.get(key, None)
@@ -269 +275 @@
                 schema_field = field.interface[field.__name__]
                 field_converter = IFieldConverter(schema_field)
+                if mode == 'update':
+                    if val == DELETION_MARKER:
+                        val = schema_field.missing_value
+                        if schema_field.required:
+                            val = schema_field.default
+                        new_data[key] = val
+                        continue
+                    if val == IGNORE_MARKER:
+                        continue
                 request.form.update(
                     field_converter.request_data(
@@ -283 +298 @@
             form_fields, 'form', obj, request)
 
-        new_data = dict()
+        #new_data = dict()
         errors = getWidgetsData(widgets, 'form', new_data)