Changeset 3139 for WAeUP_SRP/base

Timestamp:

10 Feb 2008, 07:47:38 (17 years ago)

Author:

Henrik Bettermann

Message:

use plural for pending file names

cleanup import schemas

File:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -2078 +2078 @@
             logger.error(em)
             return em
-        pending_fn = "%s/import/%s_pending.csv" % (i_home,name)
+        pending_fn = "%s/import/%ss_pending.csv" % (i_home,name)
         if pending_only:
             import_source_fn = pending_fn
-            imported_fn = "%s/import/%s_pending_imported%s.csv" % (i_home,name,current)
-            not_imported_fn = "%s/import/%s_pending_not_imported%s.csv" % (i_home,name,current)
+            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)
             attrs = csv.reader(open(pending_fn,"rb")).next()
         else:
@@ -2089 +2089 @@
             not_imported_fn = "%s/import/%s_not_imported%s.csv" % (i_home,filename,current)
             attrs = csv.reader(open(import_source_fn,"rb")).next()
-        import_keys = [k.strip() for k in attrs if not (k.strip().startswith('ignore') 
+        import_keys = [k.strip() for k in attrs if not (k.strip().startswith('ignore')
                                                         or k.strip() == 'Error')]
         diff2schema = set(import_keys).difference(set(schema.keys()))