Changeset 3315

Timestamp:

11 Mar 2008, 06:34:04 (17 years ago)

Author:

Henrik Bettermann

Message:

In getHeadlineFields wird 'ignore' für import_keys übersprungen jedoch nicht bei den values. Das führt zu einer falschen Zuordnung beim 1.record. Ich habe das geändert, bitte prüfe.

Location:

WAeUP_SRP/base

Files:

• WAeUPImport.py (modified) (2 diffs)
• skins/waeup_upload/uploads_form.pt (modified) (1 diff)

WAeUP_SRP/base/WAeUPImport.py

@@ -140 +140 @@
 
     def checkHeadline(self,headline): ###(
-        """ check the headline of an csv.file """
+        """ 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())]
@@ -152 +152 @@
 
     def getHeadlineFields(self,headline,values): ###(
-        """ check the headline of an csv.file """
-        import_keys = [k.strip() for k in headline if not (k.strip().startswith('ignore')
-                                                        or k.strip() in self.info.keys())]
+        """ 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]                                                        
         si = set(import_keys)
         ss = set(self.schema.keys())
-                 
+
         invalid_keys = si - ss
-        diff2layout = set(import_keys).difference(set(self.layout.keys()))
+        #diff2layout = set(import_keys).difference(set(self.layout.keys()))
         keys = []
         i = 0

WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

@@ -68 +68 @@
               <tr tal:repeat="key row/invalid_keys">
                 <td colspan="1"> 
-                  <font tal:attributes="color python: test(key[1] == '----','red','black')" tal:content="python: key[0]" />
+                  <font tal:attributes="color python: test(key[1] == '----' and not key[0].startswith('ignore'),'red','black')" tal:content="python: key[0]" />
                 </td>
                 <td colspan="1"