Changeset 2737

Timestamp:

Oct 17, 2006, 8:53:20 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #396: Generic export function doesn't work when column names has a comma in them

Location:

branches/2.0.1/www

Files:

• common/export/submit_export.jsp (modified) (2 diffs)
• plugins/net/sf/basedb/clients/web/plugins/simple_export.jsp (modified) (2 diffs)

branches/2.0.1/www/common/export/submit_export.jsp

@@ -113 +113 @@
 final Item itemType = Item.valueOf(request.getParameter("item_type"));
 final String subContext = Values.getString(request.getParameter("subcontext"), "");
-final String[] properties = request.getParameter("properties").split(",");
-final String[] titles = request.getParameter("titles").split(",");
+final String[] properties = request.getParameterValues("property");
+final String[] titles = request.getParameterValues("title");
 final String which = request.getParameter("which");
 final boolean asXml = "xml".equals(request.getParameter("format"));
@@ -175 +175 @@
     query.setFirstResult(0);
     query.setMaxResults(0);
-    Integer[] itemIds = Values.getInt(request.getParameter("items").split(","));
+    Integer[] itemIds = Values.getInt(request.getParameterValues("item"));
     query.restrict(
       Restrictions.in(

branches/2.0.1/www/plugins/net/sf/basedb/clients/web/plugins/simple_export.jsp

@@ -203 +203 @@
         return;
       }
-      frm.properties.value = exportedProperties.join(',');
-      frm.titles.value = getExportedColumnTitles().join(',');
-      frm.items.value = getSelectedItems().join(',');
+      for (var i = 0; i < exportedProperties.length; i++)
+      {
+        Forms.createHidden(frm, 'property', exportedProperties[i]);
+      }
+      var exportedTitles = getExportedColumnTitles();
+      for (var i = 0; i < exportedTitles.length; i++)
+      {
+        Forms.createHidden(frm, 'title', exportedTitles[i]);
+      }
+      if (Forms.getCheckedRadio(frm.which).value == 'selected')
+      {
+        var selectedItems = getSelectedItems();
+        for (var i = 0; i < selectedItems.length; i++)
+        {
+          Forms.createHidden(frm, 'item', selectedItems[i]);
+        }
+      }
+      
       frm.action = getRoot()+'common/export/submit_export.jsp';
       if (frm.path.value == '')
@@ -230 +245 @@
     <input type="hidden" name="item_type" value="<%=itemType.name()%>">
     <input type="hidden" name="subcontext" value="<%=subContext == null ? "" : subContext%>">
-    <input type="hidden" name="properties" value="">
-    <input type="hidden" name="titles" value="">
     <input type="hidden" name="items" value="">