Changeset 3316 for WAeUP_SRP/base/WAeUPImport.py

Timestamp:

11 Mar 2008, 14:16:31 (17 years ago)

Author:

joachim

Message:

allow ignore,
check for duplicates

File:

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

WAeUP_SRP/base/WAeUPImport.py

@@ -52 +52 @@
 
 NO_KEY = '----'
-
+IGNORE = 'ignore'
 class WAeUPImport(UniqueObject, SimpleItem, ActionProviderBase): ###(
     """ WAeUPImport """
@@ -143 +143 @@
         import_keys = [k.strip() for k in headline if not (k.strip().startswith('ignore')
                                                         or k.strip() in self.info.keys())]
+        # import_keys = [k.strip() for k in headline if not (k.strip() in self.info.keys())]
         diff2schema = set(import_keys).difference(set(self.schema.keys()))
         diff2layout = set(import_keys).difference(set(self.layout.keys()))
@@ -153 +154 @@
     def getHeadlineFields(self,headline,values): ###(
         """ check the headline of a csv file """
-        #import_keys = [k.strip() for k in headline if not (k.strip().startswith('ignore')
-        #                                                or k.strip() in self.info.keys())]
-        import_keys = [k.strip() for k in headline]                                                        
+        # import_keys = [k.strip() for k in headline if not (k.strip().startswith('ignore')
+        #                                                 or k.strip() in self.info.keys())]
+        import_keys = [k.strip() for k in headline if not (k.strip() in self.info.keys())]
         si = set(import_keys)
         ss = set(self.schema.keys())
 
         invalid_keys = si - ss
-        #diff2layout = set(import_keys).difference(set(self.layout.keys()))
         keys = []
         i = 0
-        for k in import_keys:
-            if k in invalid_keys:
-                keys += (k,NO_KEY,values[i]),
-            else:
-                keys += (k,k,values[i]),
-            i += 1
-        return keys
+        duplicates = False
+        singels = []
+        msg = ''
+        while True:
+            if len(values) != len(import_keys):
+                msg += "%d fields in headline but %d values" % (len(import_keys),len(values))
+                break
+            for k in import_keys:
+                if k in singels:
+                    keys += (k,'DUP_%s' % k,values[i],'duplicate'),
+                    msg += ("duplicate %s," % k)
+                    keys[singels.index(k)] = (k,'DUP_%s' % k,values[singels.index(k)],'duplicate')
+                elif k in invalid_keys and not k.startswith(IGNORE):
+                    keys += (k,NO_KEY,values[i],'invalid'),
+                else:
+                    keys += (k,k,values[i],''),
+                i += 1
+                singels += k,
+            break
+        return msg,keys
     ###)
 ###)