Changeset 3267

Timestamp:

4 Mar 2008, 08:36:26 (17 years ago)

Author:

joachim

Message:

fix for #497

1. if sex is invalid the invalid data is written to the pending-file
2. in pending_only import the imported from is not overwritten, error is still overwritten,since it can be different.
3. pending.old is created.

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -1431 +1431 @@
             return em
         import_source_fn = os.path.split(import_source_path)[1]
-        info['imported_from'] = import_source_fn
+        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:
@@ -1508 +1509 @@
                 error = results[1]
                 mapping = results[2]
+            #
+            # restore some values
+            #
             for k in empty_value_keys:
                 mapping[k] = EMPTY
             if mapping.has_key('sex'):
                 #import pdb;pdb.set_trace()
-                if mapping['sex']:
+                if mapping['sex'] == True:
                     mapping['sex'] = 'F'
-                else:
+                elif mapping['sex'] == False:
                     mapping['sex'] = 'M'
+            if pending_only:
+                info['imported_from'] = item['imported_from']
             data_string = ", ".join("%s: %s" % (k,v) for k,v in mapping.items())
             info['error'] = error
@@ -1572 +1578 @@
                     logger.info(msg)
         elapse = time.time() - elapse
+        copy2(pending_path,pending_backup)
         copy2(pending_tmp,pending_path)
         msg = "finished importing from %(import_source_fn)s in %(elapse).2f seconds, " % vars()