Changeset 3140

Timestamp:

10 Feb 2008, 16:56:16 (17 years ago)

Author:

joachim

Message:

fixes for #470

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -2083 +2083 @@
             imported_fn = "%s/import/%ss_pending_imported%s.csv" % (i_home,name,current)
             not_imported_fn = "%s/import/%ss_pending_not_imported%s.csv" % (i_home,name,current)
+            if not os.path.exists(pending_fn):
+                em = 'No  %s' % os.path.split(pending_fn)
+                return em
             attrs = csv.reader(open(pending_fn,"rb")).next()
         else:
@@ -2215 +2218 @@
             if error:
                 item['Error'] = error
-                if id and id not in pending_records.keys():
-                    item['id'] = id
-                    pending_records[id] = item
-                    msg = format_error % item
-                    logger.info("%(id)s added to pending %(msg)s" % vars())
-                    new_imports_pending += 1
+                if id:
+                    if id not in pending_records.keys():
+                        item['id'] = id
+                        pending_records[id] = item
+                        msg = format_error % item
+                        logger.info("%(id)s added to pending %(msg)s" % vars())
+                        new_imports_pending += 1
+                    else:
+                        logger.info("%(id)s already in pending %(msg)s" % vars())
                     continue
                 else:
@@ -2256 +2262 @@
             pending_csv_writer.writerows(pending_records.values())
             total_pending += len(pending_records)
+        import_source_fn = os.path.split(import_source_fn)[1]
         msg = "Finished importing in %(mode)s mode from %(import_source_fn)s: " % vars()
         msg += "%(total_imported)d imported, %(total_not_imported)d not imported " % vars()