Changeset 3347 for WAeUP_SRP/base

Timestamp:

18 Mar 2008, 16:29:37 (17 years ago)

Author:

joachim

Message:

more informative message if trying to upload a pending-file as csv.

File:

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

WAeUP_SRP/base/WAeUPImport.py

@@ -162 +162 @@
         #                                                 or k.strip() in self.info.keys())]
         import_keys = [k.strip() for k in headline if not (k.strip() in self.info.keys())]
+        info_keys = [k.strip() for k in headline if k.strip() in self.info.keys()]
         si = set(import_keys)
         ss = set(self.schema.keys())
@@ -173 +174 @@
         while True:
             if len(values) != len(import_keys):
-                msg += "%d fields in headline but %d values" % (len(import_keys),len(values))
+                if len(values) == len(import_keys) + len(info_keys):
+                    msg += "fields from pending file in headline"
+                else:
+                    msg += "%d fields in headline but %d values" % (len(import_keys),len(values))
                 break
             for k in import_keys: