JAL-1563 Modified Uniprot data column configurations and improved implementation...

[jalview.git] / src / jalview / fts / service / uniprot / UniProtFTSRestClient.java

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index c8e21e0..7eda9f8 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -58,8 +58,12 @@ public class UniProtFTSRestClient extends FTSRestClient
     int responseSize = (uniportRestRequest.getResponseSize() == 0) ? getDefaultResponsePageSize()
             : uniportRestRequest.getResponseSize();
 
-    String query = uniportRestRequest.getFieldToSearchBy() + ":"
-            + uniportRestRequest.getSearchTerm();
+    String query = uniportRestRequest.getFieldToSearchBy()
+            .equalsIgnoreCase("Search All") ? uniportRestRequest
+            .getSearchTerm()
+            : uniportRestRequest.getFieldToSearchBy() + ":"
+                    + uniportRestRequest.getSearchTerm();
+
     // + (uniportRestRequest.isAllowUnpublishedEntries() ? ""
     // : " AND status:REL");
     // System.out.println(">>>>> Query : " + query);