Changeset 3277 for WAeUP_SRP/base/WAeUPTool.py

Timestamp:

7 Mar 2008, 08:12:02 (17 years ago)

Author:

joachim

Message:

implemented new Upload functionallity

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -1467 +1467 @@
         if not pending_only:
             info['imported_from'] = import_source_fn
-        attrs = csv.reader(open(import_source_path,"rb")).next()
-        if "import_mode" not in attrs:
+        headline = csv.reader(open(import_source_path,"rb")).next()
+        if "import_mode" not in headline:
             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())]
-        diff2schema = set(import_keys).difference(set(importer.schema.keys()))
-        diff2layout = set(import_keys).difference(set(importer.layout.keys()))
-        if diff2schema and diff2schema != set(['id',]):
-            msg = 'not ignorable key(s): "%s" found in heading' % ", ".join(diff2schema)
-            return msg
+        invalid_keys = importer.checkHeadline(headline)
+        if invalid_keys:
+            return 'not ignorable key(s): "%s" found in heading' % ", ".join(invalid_keys)
+
+        # import_keys = [k.strip() for k in headline if not (k.strip().startswith('ignore')
+        #                                                 or k.strip() in info.keys())]
+        # diff2schema = set(import_keys).difference(set(importer.schema.keys()))
+        # diff2layout = set(import_keys).difference(set(importer.layout.keys()))
+        # if diff2schema and diff2schema != set(['id',]):
+        #     msg = 'not ignorable key(s): "%s" found in heading' % ", ".join(diff2schema)
+        #     return msg
         #
         # start importing
@@ -1495 +1498 @@
         count = 0
         imported = []
-        old_commit_count = 0
+        old_commit_count = -1
         error_count = imported_count = 0
         already_in = 0
@@ -1581 +1584 @@
                 logger.info(' '.join(log_list))
             finished = count > total_to_import - 1
-            must_commit = False
-            if len(imported) != old_commit_count:
-                if not len(imported) % commit_after:
-                    must_commit = True
-                    old_commit_count = len(imported)
+            must_commit = (imported_count != old_commit_count) and (not imported_count % commit_after)
+            if must_commit:
+                old_commit_count = imported_count
 
             if must_commit or finished: