Changeset 529

Timestamp:

Jan 10, 2008, 10:16:04 AM (15 years ago)

Author:

mbayer

Message:

have added code to collect the values of the files selected from the mappings page and string them together so they can be passed to the plugin code as a single parameter

Location:

branches/uk_ac_ebi_Tab2MageImporter

Files:

• Tab2MageImporter.jar (modified) (previous)
• jsp/uk/ac/ebi/nugo/plugins/experiment.jsp (modified) (2 diffs)
• jsp/uk/ac/ebi/nugo/plugins/hybridizations.jsp (modified) (4 diffs)
• jsp/uk/ac/ebi/nugo/plugins/mappings.jsp (modified) (6 diffs)
• jsp/uk/ac/ebi/nugo/plugins/protocols.jsp (modified) (2 diffs)
• lib/ebi-plugins-utils.jar (modified) (previous)
• src/uk/ac/ebi/nugo/plugins/Tab2MageImporter.java (modified) (1 diff)

branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/experiment.jsp

@@ -11 +11 @@
 final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
 final String ID = sc.getId();
-final String requestID = request.getParameter("requestId");
+final String requestID = request.getParameter("requestID");
 
 //we also need to figure out the name/id of the currently selected experiment that this import is getting initiated from
@@ -130 +130 @@
 <form name="experimentData" action="<%= request.getContextPath()%>/plugins/uk/ac/ebi/nugo/plugins/protocols.jsp" method="post">
 <input type="hidden" name="ID" value="<%=ID%>"> 
+<input type="hidden"name="requestID" value="<%=requestID%>"> 
 
 <table cellpadding="0" cellspacing="0">

branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/hybridizations.jsp

@@ -11 +11 @@
 final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
 final String ID = sc.getId();
-final String requestID = request.getParameter("requestId");
+final String requestID = request.getParameter("requestID");
  %>
 
@@ -139 +139 @@
     <td class="boldText">Dye-swap</td>
     <td class="input">yes <input type="radio" name="dyeSwap" value="yes"> no <input type="radio"
-      name="parameter:dyeSwap" value="no" checked="checked"> <br>
+      name="dyeSwap" value="no" checked="checked"> <br>
       
     </td>
@@ -149 +149 @@
     <td class="boldText">Reference sample</td>
     <td class="input">yes <input type="radio" name="refSample" value="yes" > no <input type="radio"
-      name="parameter:refSample" value="no" checked="checked"></td>
+      name="refSample" value="no" checked="checked"></td>
     <td>If you used a reference sample please indicate this here.</td>
   </tr>
@@ -194 +194 @@
     <td class="boldText">Sample pooling:</td>
     <td class="input">yes <input type="radio" name="pooling" value="yes"> no <input type="radio"
-      name="parameter:pooling" value="no" checked="checked"></td>
+      name="pooling" value="no" checked="checked"></td>
     <td>If the samples were pooled please indicate this here.</td>
   </tr>

branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/mappings.jsp

@@ -14 +14 @@
   final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
   final String ID = sc.getId();
-  final String requestID = request.getParameter("requestId");
+  final String requestID = request.getParameter("requestID");
 %>
 
@@ -27 +27 @@
 <script language="JavaScript" src="<%= request.getContextPath()%>/include/scripts/main.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript">
-  //submits form
-  function submit()
-  {
-    document.mappings.submit();
-  }
-    function getRoot()
-    {
-      return '/base/';
-    }
-    function getScale()
-    {
-      return 1.0;
-    }
+
+//submits form
+function submit()
+{
+  var frm = document.forms['mappings'];
+  frm.submit();
+}
+
+
+function getRoot()
+{
+  return '/base/';
+}
+
+function getScale()
+{
+  return 1.0;
+}
 </script>
 
@@ -51 +56 @@
 
 <input type="hidden" name="ID" value="<%=ID%>"> 
-<input type="hidden" name="cmd" value="SetParameters"> <input type="hidden" name="requestID" value="<%=requestID%>"> 
-
-<!-- these are the parameters from the input pages; need to pick them up individually from the bean here; ugly as hell but can't be done any other way -->
+<input type="hidden" name="cmd" value="SetParameters"> 
+<input type="hidden" name="requestID" value="<%=requestID%>"> 
+<input type="hidden" id="fileStringParam" name="param:fileStringParam" value""/>
+
+<!-- these are the parameters from the previous input pages; need to pick them up individually from the bean here; ugly as hell but can't be done any other way -->
 
 <!-- inputs from experiment.jsp page -->
@@ -97 +104 @@
 <input type="hidden" name="parameter:tissues" value="<%=inputDataBean.getTissues()%>">
 <input type="hidden" name="parameter:pooling" value="<%=inputDataBean.getPooling()%>">
-<input type="hidden" name="file_id" value="<%=(String)request.getAttribute("file_id") %>">
-<input type="hidden" name="parameter:zipFile" value="<%=(String)request.getParameter("path") %>" id="zipFile">
+<input type="hidden" name="parameter:zipFile" value="<%=request.getParameter("path") %>" id="zipFile">
 
 <%
-  System.out.println("all parameter values in mappings.jsp:");
+  System.out.println("all parameter values for mappings.jsp:");
   for (java.util.Enumeration e = request.getParameterNames(); e.hasMoreElements();)
   {
@@ -200 +206 @@
     <!-- first we need a cell with a drop down menu where we can select a filename to match the combination of factor values-->
 
-    <td class="input" name="fileinput<%=i %>"><select>
+    <td class="input" ><select id="fileinput<%=i %>">
       <%
           for (int k = 0; k < fileNamesArr.length; k++)
@@ -243 +249 @@
 </form>
 
+<script language="JavaScript" type="text/javascript">
+//collects all the values from the file selector boxes and strings them together so they can be 
+//passed on as a single parameter for plugin configuration
+{
+  var fileString = '';
+  var frm = document.forms['mappings'];
+  var numElements = frm.elements.length;
+  document.write(numElements);
+  document.write("<br />");
+  for(var i = 0; i < numElements; i++)
+  {
+    var value = frm.elements[i].value;
+    var id = frm.elements[i].id;
+
+    if(id.match("fileinput"))
+    {
+      document.write("id = " + id);
+      document.write("<br />");
+      document.write("value = " + value);
+      document.write("<br />");
+      fileString += frm.elements[i].value + '\t';
+    }
+  }
+  document.write('combined output = ' + fileString);
+  frm.fileStringParam.value = fileString;
+  document.write('value of hidden input = ' + frm.fileStringParam.value);
+}
+</script>
+
 </body>
 </html>

branches/uk_ac_ebi_Tab2MageImporter/jsp/uk/ac/ebi/nugo/plugins/protocols.jsp

@@ -34 +34 @@
 final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
 final String ID = sc.getId();
-final String requestID = request.getParameter("requestId");
+final String requestID = request.getParameter("requestID");
 
 
@@ -120 +120 @@
 <form name="protocols" action="<%= request.getContextPath()%>/plugins/uk/ac/ebi/nugo/plugins/hybridizations.jsp" method="post">
 <input type="hidden" name="ID" value="<%=ID%>">
+<input type="hidden"name="requestID" value="<%=requestID%>"> 
 
 <h1>Tab2MAGE Importer -- Your Protocols</h1>

branches/uk_ac_ebi_Tab2MageImporter/src/uk/ac/ebi/nugo/plugins/Tab2MageImporter.java

@@ -113 +113 @@
           "hybridizationProtocolParams","scanningProtocolParams","platform","organism",
           "numDesigns","dyeSwap","refSample","numTreatmentGroups","expFactors","numReplicates",
-          "tissues","pooling","zipFile"};
+          "tissues","pooling","zipFile", "fileStringParam"};