Changeset 3155

Timestamp:

13 Feb 2008, 14:18:58 (17 years ago)

Author:

joachim

Message:

fix for overwritten course_results, pending_only import fixed to not
overwrite empty values.

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (4 diffs)
• skins/waeup_utilities/ti_474_resolve.py (added)

WAeUP_SRP/base/WAeUPTool.py

@@ -2121 +2121 @@
         #
         not_imported_keys = import_keys + ["Error",]
-        not_imported_file = open(not_imported_fn,"a")
+        not_imported_file = open(not_imported_fn,"w")
         not_imported_csv_writer = csv.DictWriter(not_imported_file,
                                                     not_imported_keys,
@@ -2134 +2134 @@
         if 'id' not in imported_keys:
             imported_keys.insert(0,"id")
-        imported_file = open(imported_fn,"a")
+        imported_file = open(imported_fn,"w")
         imported_csv_writer = csv.DictWriter(imported_file,
                                              imported_keys,
@@ -2178 +2178 @@
                 pending_imported_ids = []
                 pending_imported = []
-                for item in pending_records.values():
+                for record in pending_records.values():
+                    item = {}
+                    for k,v in record.items():
+                        if v:
+                            item[k] = v
                     results = importer(item)
                     id = results[0]
@@ -2185 +2189 @@
                     if is_pending:
                         continue
-                    if error:
-                        continue
-                    msg = format % item
+                    del item['Error']
+                    msg = ";".join(["%s : %s" % (k,v) for k,v in item.items()])
                     logger.info("imported from %(pending_fn)s %(msg)s" % vars())
                     pending_imported.append(item)
                     pending_imported_ids += id,
                     total_pending_imported = len(pending_imported_ids)
-                logger.info("imported %d pending imports" % len(pending_imported_ids))
+                    logger.info("imported %d pending imports" % len(pending_imported_ids))
                 for id in pending_imported_ids:
-                    if pending_records.has_key(id):
-                        del pending_records[id]
+                    del pending_records[id]
             pending_imports_file = open(pending_fn,'w')
             pending_csv_writer = csv.DictWriter(pending_imports_file,