Changeset 3316 for WAeUP_SRP/base/skins/waeup_upload

Timestamp:

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

Author:

joachim

Message:

allow ignore,
check for duplicates

Location:

WAeUP_SRP/base/skins/waeup_upload

Files:

• uploads_form.pt (modified) (1 diff)
• uploads_index.py (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

@@ -66 +66 @@
                 <th>Value from 1. record</th>
               </tr>
-              <tr tal:repeat="key row/invalid_keys">
+              <tr tal:repeat="key row/fields">
                 <td colspan="1"> 
-                  <font tal:attributes="color python: test(key[1] == '----' and not key[0].startswith('ignore'),'red','black')" tal:content="python: key[0]" />
+                  <font tal:attributes="color python: test(key[3],'red','black')">
+                    <span tal:content="python: key[1]" tal:omit-tag=""/> 
+                    <span tal:condition="python: key[3]" tal:content="python: key[3]" tal:omit-tag=""/> 
+                  </font>
                 </td>
                 <td colspan="1" 
                     tal:define="old_key python: key[0];new_key python: key[1];">
-                  <select tal:attributes="name string:${row/id}|${old_key}.valid_key:record">
+                  <select tal:attributes="name string:${row/id}|${repeat/key/index}.valid_key:record">
                     <option tal:repeat="new row/valid_keys"
-                            tal:attributes="value new; selected python: new == new_key"
+                            tal:attributes="value new; selected python: new_key == new"
                             tal:content="new" />
                   </select><br />

WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

@@ -36 +36 @@
 edit = request.form.has_key('edit')
 ids = request.get('ids',[])
-#set_trace()
 if edit and ids:
     for long_id in ids:
@@ -46 +45 @@
         msg, invalid_keys = doc['checkKeys']()
         new_keys = []
-        for old_key,previous,value in invalid_keys:
-            id_key = "%s|%s" % (short_id,old_key)
+        i = 0
+        for old_key,previous,value,err in invalid_keys:
+            id_key = "%s|%s" % (short_id,i)
             if request.form.has_key(id_key):
                 new_key = request.form.get(id_key)['valid_key']
-                if new_key != old_key and new_key != doc.NO_KEY:
-                    new_keys += (old_key,new_key),
+                if new_key != old_key:
+                    if new_key == doc.IGNORE:
+                        new_keys += (old_key,"%s_%s" % (doc.IGNORE,old_key),i),
+                    elif new_key != doc.NO_KEY:
+                        new_keys += (old_key,new_key,i),
+            i += 1
         if new_keys:
             doc.editHeadline(new_keys)
             for key in new_keys:
-                logger.info('%s changed column heading in file %s from %s to %s' % (member,long_id,key[0],key[1]))
+                logger.info('%s changed column %s heading in file %s from %s to %s' % (member,
+                                                                                    key[2],
+                                                                                    long_id,
+                                                                                    key[0],
+                                                                                    key[1]))
     return request.RESPONSE.redirect(context.absolute_url())
 
@@ -67 +75 @@
     row['valid_keys'] = doc['getKeys']()
     row['valid_keys'][0:0] = doc.NO_KEY,
+    row['valid_keys'][1:1] = doc.IGNORE,
     row['id'] = id.replace('.csv','')
     row['title'] = doc.filename
     row['url'] = upload.absolute_url()
     row['imported'] = False
-    row['invalid_keys'] = []
+    row['fields'] = []
     import_message = getattr(doc,'import_message','')
     if import_message:
@@ -83 +92 @@
         add_to = imported
     else:
-        row['msg'],row['invalid_keys'] = doc['checkKeys']()
+        row['msg'],row['fields'] = doc['checkKeys']()
         if not (request.has_key('goto_edit') and id in ids) and not row['msg']:
             add_to = importable