From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Mon, 3 Oct 2011 13:14:10 +0000 (+0100)
Subject: removed unnecessary parameters and changed alignment upload to use file upload parame... 
X-Git-Tag: Archived_Release_2_7~23
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b69d271a9c1b122869742832b09675de2dc7c84a;p=jalview.git

removed unnecessary parameters and changed alignment upload to use file upload parameter (JAL-949)
---

diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java
index f42c0c4..95de391 100644
--- a/src/jalview/ws/rest/RestClient.java
+++ b/src/jalview/ws/rest/RestClient.java
@@ -309,18 +309,19 @@ public class RestClient extends WSClient implements WSClientI,
     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);