removed unnecessary parameters and changed alignment upload to use file upload parame...

[jalview.git] / src / jalview / ws / rest / RestClient.java

diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java
index 0d56e87..95de391 100644 (file)
--- a/src/jalview/ws/rest/RestClient.java
+++ b/src/jalview/ws/rest/RestClient.java
@@ -1,3 +1,20 @@
+/*******************************************************************************
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
 /**
  * 
  */
@@ -287,23 +304,24 @@ public class RestClient extends WSClient implements WSClientI,
 
   public static RestClient makeShmmrRestClient()
   {
-    String action = "Analysis", description = "Sequence Harmony and Multi-Relief (UNSTABLE!)", name = "Sequence Harmony";
+    String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = "Multi-Harmony";
     Hashtable<String, InputType> iparams = new Hashtable<String, InputType>();
     jalview.ws.rest.params.JobConstant toolp;
     //toolp = new jalview.ws.rest.JobConstant("tool","jalview");
     //iparams.put(toolp.token, toolp);
-    toolp = new jalview.ws.rest.params.JobConstant("mbjob[method]","shmr");
-    iparams.put(toolp.token, toolp);
-    toolp = new jalview.ws.rest.params.JobConstant("mbjob[description]","step 1");
-    iparams.put(toolp.token, toolp);
-    toolp = new jalview.ws.rest.params.JobConstant("start_search","1");
-    iparams.put(toolp.token, toolp);
-    toolp = new jalview.ws.rest.params.JobConstant("blast","0");
-    iparams.put(toolp.token, toolp);
+    //toolp = new jalview.ws.rest.params.JobConstant("mbjob[method]","shmr");
+    //iparams.put(toolp.token, toolp);
+    //toolp = new jalview.ws.rest.params.JobConstant("mbjob[description]","step 1");
+    //iparams.put(toolp.token, toolp);
+    //toolp = new jalview.ws.rest.params.JobConstant("start_search","1");
+    //iparams.put(toolp.token, toolp);
+    //toolp = new jalview.ws.rest.params.JobConstant("blast","0");
+    //iparams.put(toolp.token, toolp);
     
     jalview.ws.rest.params.Alignment aliinput = new jalview.ws.rest.params.Alignment();
-    aliinput.token = "ali";//_file";
-    aliinput.writeAsFile=false;//true;
+    // SHMR server has a 65K limit for content pasted into the 'ali' parameter, so we always upload our files.
+    aliinput.token = "ali_file";//_file";
+    aliinput.writeAsFile=true;//true;
     //aliinput.token = "ali_file";
     //aliinput.writeAsFile=true;
     iparams.put(aliinput.token, aliinput);
@@ -317,7 +335,7 @@ public class RestClient extends WSClient implements WSClientI,
             action,
             description,
             name,
-            "http://www.ibi.vu.nl/programs/shmrwww/index.php?tool=jalview",// ?tool=jalview&mbjob[method]=shmr&mbjob[description]=step1",
+            "http://zeus.few.vu.nl/programs/shmrwww/index.php?tool=jalview",// ?tool=jalview&mbjob[method]=shmr&mbjob[description]=step1",
             "?tool=jalview", iparams, true, false, '-');
     // a priori knowledge of the data returned from the service
     shmrService.addResultDatatype(JvDataType.ANNOTATION);