Changeset 3162

Timestamp:

14 Feb 2008, 08:04:50 (17 years ago)

Author:

joachim

Message:

fix for #477

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (1 diff)
• skins/waeup_default/get_csv_names.py (modified) (1 diff)

WAeUP_SRP/base/WAeUPTool.py

@@ -2096 +2096 @@
                 em = 'No  %s' % os.path.split(pending_fn)
                 return em
-            attrs = csv.reader(open(pending_fn,"rb")).next()
         else:
             import_source_fn = "%s/import/%s.csv" % (i_home,filename)
             imported_fn = "%s/import/%s_imported%s.csv" % (i_home,filename,current)
             not_imported_fn = "%s/import/%s_not_imported%s.csv" % (i_home,filename,current)
-            attrs = csv.reader(open(import_source_fn,"rb")).next()
+        if not os.path.exists(import_source_fn):
+            em = 'No  %s' % os.path.split(import_soure_fn)
+            return em
+        attrs = csv.reader(open(import_source_fn,"rb")).next()
         import_keys = [k.strip() for k in attrs if not (k.strip().startswith('ignore')
                                                         or k.strip() == 'Error')]

WAeUP_SRP/base/skins/waeup_default/get_csv_names.py

@@ -7 +7 @@
 files = context.waeup_tool.get_csv_filenames()
 if key is None:
-    l = [(f[:-4],f) for f in files]
+    if files:
+        l = [(f[:-4],f) for f in files]
+    else:
+        l = []
+    l.insert(0,('--','without new data'))
     l.sort(cmp=lambda x,y: cmp(x[0].lower(), y[0].lower()))
     return l
 
-return files[files.index("%s.csv" % key)]
-
+if "%s.csv" % key in files:
+    return files[files.index("%s.csv" % key)]
+return ('--','without new data')