Changeset 1106 for extensions/net.sf.basedb.genepattern

Timestamp:

Jun 2, 2009, 9:34:10 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #224: Add a "Test" button on the GenePattern? 'edit server' page

Now using Ajax to do the test which means that we don't need to 'forward' from the servlet and we only need BASE 2.12.0.

Location:

extensions/net.sf.basedb.genepattern/trunk

Files:

• build.xml (modified) (1 diff)
• resources/edit_server.jsp (modified) (4 diffs)
• resources/options.jsp (modified) (3 diffs)
• resources/server_test.jsp (deleted)
• resources/submit.jsp (modified) (1 diff)
• src/net/sf/basedb/genepattern/servlet/TestServer.java (modified) (4 diffs)

extensions/net.sf.basedb.genepattern/trunk/build.xml

@@ -23 +23 @@
   <property name="javac.target" value="1.5" />
   <property name="javac.encoding" value="UTF-8" />
-  <property name="depend.jars" value="http://base2.thep.lu.se/base/jars/2.12.1" />
+  <property name="depend.jars" value="http://base2.thep.lu.se/base/jars/2.12.0" />
   <property name="genepattern.jars" value="http://genepattern.broad.mit.edu/gp/downloads" />
 

extensions/net.sf.basedb.genepattern/trunk/resources/edit_server.jsp

@@ -57 +57 @@
 %>
 <base:page type="popup" title="<%=HTML.encodeTags(title)%>">
-<base:head scripts="tabcontrol.js" styles="tabcontrol.css">
+<base:head scripts="ajax.js">
   <script language="JavaScript">
   function validate()
@@ -89 +89 @@
     url += '&login=' + encodeURIComponent(frm.gpLogin.value);
     url += '&password=' + encodeURIComponent(frm.gpPassword.value);
-    Main.openPopup(url, 'TestGPServer', 700, 500);
+    var request = Ajax.getXmlHttpRequest();
+    request.open("GET", url, true);
+    Ajax.setReadyStateHandler(request, testResult);
+    request.send(null);
+    document.getElementById('testStatus').innerHTML = 'Testing';
+    document.getElementById('testReport').innerHTML = 'Please wait...';
   }
+
+  function testResult(request)
+  {
+    var frm = document.forms['options'];
+    var response = request.responseText; //.split('\n');
+    var testStatus;
+    var testReport;
+    if (response == 'ok')
+    {
+      testStatus = 'Test result';
+      testReport = 'Test of <b>' + frm.gpServer.value + '</b> was successful';
+    }
+    else
+    {
+      testStatus = 'Test failed';
+      testReport = '<div class="error stacktrace" style="width: 420px; height: 15em; overflow: auto;">' + response + '</div>';
+    }
+    document.getElementById('testStatus').innerHTML = testStatus;
+    document.getElementById('testReport').innerHTML = testReport;
+  }
+  
   </script>
 </base:head>
 <base:body>
   <form action="submit.jsp?ID=<%=ID%>" method="post" name="options" onsubmit="return false;">
-  <input type=hidden name="cmd" value="SaveServer">
-  
+  <input type="hidden" name="cmd" value="SaveServer">
+  <input type="hidden" name="originalGpServer" value="<%=HTML.encodeTags(server.getName())%>">
+
   <h3 class="docked"><%=HTML.encodeTags(title)%></h3>
   <div class="boxedbottom">
@@ -102 +129 @@
     <tr>
       <td class="prompt">Server URL</td>
-      <td><input class="text required" type="text" name="gpServer" size="40"
+      <td colspan="2"><input class="text required" type="text" name="gpServer" size="50"
           value="<%=HTML.encodeTags(server.getName())%>"></td>
     </tr>
     <tr>
       <td class="prompt">Login</td>
-      <td><input class="text required" type="text" name="gpLogin" size="40"
+      <td colspan="2"><input class="text required" type="text" name="gpLogin" size="50"
           value="<%=HTML.encodeTags(server.getSetting("server.login"))%>"></td>
     </tr>
     <tr>
       <td class="prompt">Password</td>
-      <td><input class="text" type="password" name="gpPassword" size="20"
-          value="<%=HTML.encodeTags(server.getSetting("server.password"))%>"></td>
+      <td><input class="text" type="password" name="gpPassword" size="30"
+          value="<%=HTML.encodeTags(server.getSetting("server.password"))%>">
+      </td>
+      <td>
+        <table border=0 cellspacing=0 cellpadding=0 align="right"><tr><td>
+        <base:button onclick="testServer();" title="Test" 
+        image="<%=homeUrl + "/images/genepattern.gif" %>" 
+        onclick="testServer()" />
+        </td></tr></table>
+      </td>
+    </tr>
+    <tr>
+      <td class="prompt" id="testStatus"></td>
+      <td colspan="2" id="testReport">
+      </td>
     </tr>
     </table>
@@ -120 +160 @@
   <table align="center">
   <tr>
-    <td width="33%"><base:button onclick="testServer();" title="Test" 
-      image="<%=homeUrl + "/images/genepattern.gif" %>" 
-      onclick="testServer()" /></td>
-    <td width="33%"><base:button onclick="saveSettings();" title="Save" /></td>
-    <td width="33%"><base:button onclick="window.close();" title="Cancel" /></td>
+    <td width="50%"><base:button onclick="saveSettings();" title="Save" /></td>
+    <td width="50%"><base:button onclick="window.close();" title="Cancel" /></td>
   </tr>
   </table>

extensions/net.sf.basedb.genepattern/trunk/resources/options.jsp

@@ -67 +67 @@
   function addServer()
   {
-    Main.openPopup('edit_server.jsp?ID=<%=ID%>&gpServer=', 'EditGPServer', 500, 300);
+    Main.openPopup('edit_server.jsp?ID=<%=ID%>&gpServer=', 'EditGPServer', 600, 400);
   }
   function editServer()
@@ -78 +78 @@
     }
     var gpServer = frm.servers[frm.servers.selectedIndex].text;
-    Main.openPopup('edit_server.jsp?ID=<%=ID%>&gpServer=' + encodeURIComponent(gpServer), 'EditGPServer', 500, 300);
+    Main.openPopup('edit_server.jsp?ID=<%=ID%>&gpServer=' + encodeURIComponent(gpServer), 'EditGPServer', 600, 400);
   }
   function removeServer()
@@ -110 +110 @@
       <select name="servers" multiple="multiple" size="10" style="width: 25em;">
       <%
+      String selected = "selected";
       for (Presets.Preset server : presets)
       {
         %>
-        <option><%=HTML.encodeTags(server.getName())%>
+        <option <%=selected%>><%=HTML.encodeTags(server.getName())%>
         <%
+        selected = "";
       }
       %>

extensions/net.sf.basedb.genepattern/trunk/resources/submit.jsp

@@ -53 +53 @@
     Presets presets = new Presets();
     if (presetsXml != null) presets.loadFrom(presetsXml);
+    String originalGpServer = request.getParameter("originalGpServer");
     String gpServer = request.getParameter("gpServer");
     Preset server = presets.getPreset(gpServer);
+    if ("".equals(originalGpServer))
+    {
+      // Adding a new server - check if one already exists
+      if (server.getSetting("server.login") != null)
+      {
+        throw new WebException("popup", "Server exists", "The server {1} already exists", gpServer);
+      }
+    }
+    else if (!gpServer.equals(originalGpServer))
+    {
+      // The URL of an existing server has been modified
+      presets.deletePreset(originalGpServer);
+    }
     server.setSetting("server.login", request.getParameter("gpLogin"));
     server.setSetting("server.password", request.getParameter("gpPassword"));
     sc.setUserClientSetting("net.sf.basedb.genepattern.options", presets.asXml());
-    message = gpServer + " stored ok";
+    message = gpServer + " saved";
   }
   else if ("RemoveServer".equals(cmd))

extensions/net.sf.basedb.genepattern/trunk/src/net/sf/basedb/genepattern/servlet/TestServer.java

@@ -24 +24 @@
 package net.sf.basedb.genepattern.servlet;
 
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -32 +31 @@
 
 import net.sf.basedb.util.Values;
+import net.sf.basedb.util.error.ThrowableUtil;
 
 import org.genepattern.client.GPClient;
@@ -79 +79 @@
     String login = request.getParameter("login");
     String password = Values.getStringOrNull(request.getParameter("password"));
+    String result = "ok";
     try
     {
@@ -94 +95 @@
     catch (WebServiceException ex)
     {
-      request.setAttribute("exception", ex);
+      result = ThrowableUtil.stackTraceToString(ex);
     }
-    RequestDispatcher forward = request.getRequestDispatcher("server_test.jsp");
-    forward.forward(request, response);
+    response.getWriter().print(result);
   }