Changeset 3191 for WAeUP_SRP/base

Timestamp:

20 Feb 2008, 16:50:08 (17 years ago)

Author:

joachim

Message:

first version with import_mode per line, please copy xml files to okene.

Location:

WAeUP_SRP/base

Files:

• WAeUPImport.py (modified) (3 diffs)
• WAeUPTool.py (modified) (7 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -55 +55 @@
     required_modes = ('create',)
 
-    def __init__(self,mode,waeup_tool):
+    def __init__(self,waeup_tool):
         self.member = member = waeup_tool.portal_membership.getAuthenticatedMember()
         self.import_date = DateTime.DateTime().strftime("%d/%m/%y %H:%M:%S")
@@ -68 +68 @@
         self.courses_catalog = waeup_tool.courses_catalog
         self.course_results = waeup_tool.course_results
-        self.mode = mode
-        self.import_method = getattr(self, '%s' % mode,None)
+        #self.mode = mode
+        # self.import_method = getattr(self, '%s' % mode,None)
         errors = []
-        if self.import_method is None:
-            errors.append('No importer method %s' % mode)
+        # if self.import_method is None:
+        #     errors.append('No importer method %s' % mode)
         self.pending_path = "%s/import/%s.pending" % (i_home,self.plural_name)
         self.pending_tmp = "%s/import/%s.pending.tmp" % (i_home,self.plural_name)
@@ -96 +96 @@
         info['imported_by'] = str(member)
         info['import_date'] = self.import_date
-        info['import_mode'] = mode
+        #info['import_mode'] = mode #now in import_xxx schema + layout
         info['error'] = ''
         #info['digest'] = ''

WAeUP_SRP/base/WAeUPTool.py

@@ -1353 +1353 @@
         if filename == pend_str:
             pending_only = True
-        mode = "create"
-        if edit:
-            if filename.endswith('_toDelete'):
-                mode = "delete"
-            else:
-                mode = "edit"
+        # mode = "create"
+        # if edit:
+        #     if filename.endswith('_toDelete'):
+        #         mode = "delete"
+        #     else:
+        #         mode = "edit"
         importer_name = ''.join([part.capitalize() for part in name.split('_')])
-        importer = eval("%sImport" % importer_name)(mode,self)
+        importer = eval("%sImport" % importer_name)(self)
         logger = importer.logger
         if importer.init_errors:
-            logger.info(self.init_errors)
-            return self.init_errors
+            logger.info(importer.init_errors)
+            return importer.init_errors
         member = importer.member
         current = importer.current
@@ -1423 +1423 @@
         info['imported_from'] = import_source_fn
         attrs = csv.reader(open(import_source_path,"rb")).next()
+        if "import_mode" not in attrs:
+            msg = 'import_mode must be in heading'
+            return msg
+            
         import_keys = [k.strip() for k in attrs if not (k.strip().startswith('ignore')
                                                         or k.strip() in info.keys())]
@@ -1430 +1434 @@
             msg = 'not ignorable key(s): "%s" found in heading' % ", ".join(diff2schema)
             return msg
-        if mode in importer.required_modes:
-            required_keys = [importer.layout.getIdUnprefixed(id)
-                                for id,widget in importer.layout.objectItems()
-                                if widget.is_required]
-            if not set(required_keys).issubset(set(import_keys)):
-                diff2import = set(required_keys).difference(set(import_keys))
-                msg = 'required key(s): "%s" not found in heading' % ", ".join(diff2import)
-                return msg
+        # if import_mode in importer.required_modes:
+        #     required_keys = [importer.layout.getIdUnprefixed(id)
+        #                         for id,widget in importer.layout.objectItems()
+        #                         if widget.is_required]
+        #     if not set(required_keys).issubset(set(import_keys)):
+        #         diff2import = set(required_keys).difference(set(import_keys))
+        #         msg = 'required key(s): "%s" not found in heading' % ", ".join(diff2import)
+        #         return msg
         #
         # start importing
@@ -1467 +1471 @@
                 start = False
                 adapters = [MappingStorageAdapter(importer.schema, item)]
-                logger.info('%(member)s starts import from %(import_source_fn)s in %(mode)s mode' % vars())
-                #logger.info('%s starts import from %s in %s mode with schema and layout %s' % (member,filename,mode,iname))
+                logger.info('%(member)s starts import from %(import_source_fn)s' % vars())
             dm = DataModel(item, adapters,context=self)
             ds = DataStructure(data=item,datamodel=dm)
@@ -1474 +1477 @@
             total += 1
             error_count = 0
-            for k in import_keys:
-                if k not in item.keys() or k not in importer.validators.keys():
-                    continue
-                if not importer.validators[k](ds,mode=mode):
-                    if error_count:
-                        error_string += ' ++ '
-                    error_string += "%s: %s" % (k,self.translation_service(ds.getError(k),
+            import_mode = item.get('import_mode','edit')
+            import_method = getattr(importer, '%(import_mode)s' % vars(),None )
+            if import_method is None:
+                error_string += "no %(import_mode)s " % vars()
+            else:
+                for k in import_keys:
+                    if k not in item.keys() or k not in importer.validators.keys():
+                        continue
+                    if not importer.validators[k](ds,mode=import_mode):
+                        if error_count:
+                            error_string += ' ++ '
+                            error_string += "%s: %s" % (k,self.translation_service(ds.getError(k),
                                                                            ds.getErrorMapping(k)))
-                    error_count += 1
+                            error_count += 1
             if error_string:
                 error = error_string
@@ -1490 +1498 @@
                 temp_item = item.copy()
                 temp_item.update(dm)
-                import_method = importer.import_method
-                if pending_only:
-                    import_mode = temp_item.get('import_mode','edit')
-                    import_method = getattr(importer, '%(import_mode)s' % vars() )
-                    info['import_mode'] = import_mode
                 results = import_method(temp_item)
                 id = results[0]
@@ -1567 +1570 @@
         elapse = time.time() - elapse
         copy2(pending_tmp,pending_path)
-        msg = "finished importing in %(mode)s mode from %(import_source_fn)s in %(elapse).2f seconds, " % vars()
+        msg = "finished importing from %(import_source_fn)s in %(elapse).2f seconds, " % vars()
         msg += "%(count)d records totally read, %(total_added_to_imported)d added to %(imported_fn)s, " % vars()
         if pending_only: