Changeset 3250

Timestamp:

28 Feb 2008, 09:33:58 (17 years ago)

Author:

joachim

Message:

fix for #93

File:

• WAeUP_SRP/base/WAeUPImport.py (modified) (3 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -70 +70 @@
         self.courses_catalog = waeup_tool.courses_catalog
         self.course_results = waeup_tool.course_results
+        self.applicants_catalog = waeup_tool.applicants_catalog
         #self.mode = mode
         # self.import_method = getattr(self, '%s' % mode,None)
@@ -84 +85 @@
         self.logger = logging.getLogger('WAeUPImport.%sImport' % self.plural_name.capitalize())
         self.schema = self.schema_tool._getOb(iname,None)
-        self.pending_schema = self.schema_tool._getOb("%s_pending" % iname,None)
+        #self.pending_schema = self.schema_tool._getOb("%s_pending" % iname,None)
         self.layout = self.layout_tool._getOb(iname,None)
-        if self.schema is None:
-            errors.append('no schema %s' % iname)
-        if self.pending_schema is None:
-            self.pending_schema = self.schema
-        if self.layout is None:
-            errors.append('no such layout %s' % iname)
-        self.data_keys = self.pending_schema.keys()
-        self.csv_keys = self.pending_schema.keys()
-        info = {}
-        info['imported_from'] = ''
-        info['imported_by'] = str(member)
-        info['import_date'] = self.import_date
-        #info['import_mode'] = mode #now in import_xxx schema + layout
-        info['error'] = ''
-        #info['digest'] = ''
-        self.info = info
-        self.csv_keys.extend(self.info)
-        self.validators = {}
-        for widget in self.layout.keys():
-            self.validators[widget] = self.layout[widget].validate
-        self.required_keys = {}
-        for mode in self.required_modes:
-            self.required_keys[mode] = [self.layout.getIdUnprefixed(id)
-                                for id,widget in self.layout.objectItems()
-                                if widget.is_required]
+        while True:
+            if self.schema is None:
+                errors.append('no schema %s' % iname)
+            # if self.pending_schema is None:
+            #     self.pending_schema = self.schema
+            if self.layout is None:
+                errors.append('no such layout %s' % iname)
+            if errors:
+                break
+            self.data_keys = self.schema.keys()
+            self.csv_keys = self.schema.keys()
+            info = {}
+            info['imported_from'] = ''
+            info['imported_by'] = str(member)
+            info['import_date'] = self.import_date
+            info['error'] = ''
+            self.info = info
+            self.csv_keys.extend(self.info)
+            self.validators = {}
+            for widget in self.layout.keys():
+                self.validators[widget] = self.layout[widget].validate
+            self.required_keys = {}
+            for mode in self.required_modes:
+                self.required_keys[mode] = [self.layout.getIdUnprefixed(id)
+                                    for id,widget in self.layout.objectItems()
+                                    if widget.is_required]
+            break
         self.init_errors = ','.join(errors)
 
@@ -134 +137 @@
 
 class ApplicationImport(WAeUPImport):###(
-    name = "applications"
+    name = "application"
     plural_name = "%ss" % name
     commit_after = 1000