Changeset 1126

Timestamp:

Jun 15, 2009, 2:02:54 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #221: Configure GenePattern? server

Added field for URL to BASE. This seems to be the easiest way to let the plug-in know about
the BASE web server. Also moved the "test" button back to it's previous location.

Location:

extensions/net.sf.basedb.genepattern/trunk

Files:

• resources/edit_server.jsp (modified) (5 diffs)
• resources/submit.jsp (modified) (3 diffs)
• src/net/sf/basedb/genepattern/GPServer.java (modified) (1 diff)

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

@@ -54 +54 @@
 if (presetsXml != null) presets.loadFrom(presetsXml);
 Preset server = gpServer == null ? presets.getDefault() : presets.getPreset(gpServer);
+if (server.getSetting("base.url") == null)
+{
+  final String scheme = request.getScheme();
+  final String serverName = request.getServerName();
+  final int serverPort = request.getServerPort();
+  server.setSetting("base.url", scheme + "://" + serverName + ":" + serverPort);
+}
 String title = "Options for " + (gpServer == null ? "new" : gpServer);
 %>
@@ -72 +79 @@
       alert('A login must be specified');
       frm.gpServer.focus();
+      return false;
+    }
+    else if (frm.baseUrl.value == '')
+    {
+      alert('The URL to BASE must be specified');
+      frm.baseUrl.focus();
       return false;
     }
@@ -120 +133 @@
       testStatus = 'Test failed';
       var stacktrace = response.getElements()[0]['stacktrace'];
-      testReport = '<div class="error stacktrace" style="width: 420px; height: 15em; overflow: auto;">' + stacktrace + '</div>';
+      testReport = '<div class="error stacktrace" style="width: 350px; height: 15em; overflow: auto;">' + stacktrace + '</div>';
     }
     else
@@ -141 +154 @@
     <table class="form" cellspacing="0" width="100%">
     <tr>
-      <td class="prompt">Server URL</td>
-      <td><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="50"
-          value="<%=HTML.encodeTags(server.getSetting("server.login"))%>"></td>
-    </tr>
-    <tr>
-      <td class="prompt">Password</td>
+      <td class="prompt">GenePattern server</td>
+      <td colspan="2"><input class="text required" type="text" name="gpServer" size="45"
+        value="<%=HTML.encodeTags(server.getName())%>" 
+        title="The URL to the GenePattern server"></td>
+    </tr>
+    <tr>
+      <td class="subprompt">-login</td>
+      <td colspan="2"><input class="text required" type="text" name="gpLogin" size="45"
+        value="<%=HTML.encodeTags(server.getSetting("server.login"))%>"
+        title="Your login to the above GenePattern server"></td>
+    </tr>
+    <tr>
+      <td class="subprompt">-password</td>
       <td><input class="text" type="password" name="gpPassword" size="30"
-          value="<%=HTML.encodeTags(server.getSetting("server.password"))%>">
+        value="<%=HTML.encodeTags(server.getSetting("server.password"))%>"
+        title="Leave empty if no password is needed">
+      </td>
+      <td>
+        <table border="0" cellspacing="0" cellpadding="0">
+        <tr><td><base:button onclick="testServer();" title="Test" 
+          image="<%=homeUrl + "/images/genepattern.gif" %>" /></td></tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <td class="prompt">BASE server</td>
+      <td colspan="2"><input type="text" class="text required" name="baseUrl" size="45"
+        value="<%=HTML.encodeTags(server.getSetting("base.url"))%>"
+        title="The URL to this BASE server as seen from the GenePattern server">
       </td>
     </tr>
     <tr>
       <td class="prompt" id="testStatus"></td>
-      <td id="testReport">
+      <td id="testReport" colspan="2">
       </td>
     </tr>
@@ -167 +196 @@
   <table align="center">
   <tr>
-    <td width="33%"><base:button onclick="testServer();" title="Test" 
-      image="<%=homeUrl + "/images/genepattern.gif" %>" /></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/submit.jsp

@@ -107 +107 @@
     server.setSetting("server.login", request.getParameter("gpLogin"));
     server.setSetting("server.password", request.getParameter("gpPassword"));
+    server.setSetting("base.url", request.getParameter("baseUrl"));
     savePreset(dc, presets);
     dc.commit();
@@ -121 +122 @@
     savePreset(dc, presets);
     dc.commit();
-    message = gpServer + " deleted";    
+    message = gpServer + " deleted";
   }
   else
@@ -141 +142 @@
 }
 %>
-

extensions/net.sf.basedb.genepattern/trunk/src/net/sf/basedb/genepattern/GPServer.java

@@ -60 +60 @@
   }
   
+  /**
+    Get the URL to the current BASE server as seen from
+    the GenePattern server.
+  */
+  public String getBaseUrl()
+  {
+    return preset.getSetting("base.url");
+  }
   
 }