JAL-1563 Fixed Uniprot FTS result-set count error, added blank image placeholder...

[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 57689f9..0541881 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -58,8 +58,7 @@ public class UniProtFTSRestClient extends FTSRestClient
     int responseSize = (uniportRestRequest.getResponseSize() == 0) ? getDefaultResponsePageSize()
             : uniportRestRequest.getResponseSize();
 
-    int offSet = (uniportRestRequest.getOffSet() == 0) ? getDefaultResponsePageSize()
-            : uniportRestRequest.getOffSet();
+    int offSet = uniportRestRequest.getOffSet();
 
     String query = uniportRestRequest.getFieldToSearchBy()
             .equalsIgnoreCase("Search All") ? uniportRestRequest
@@ -71,6 +70,9 @@ public class UniProtFTSRestClient extends FTSRestClient
     // : " AND status:REL");
     // System.out.println(">>>>> Query : " + query);
     // System.out.println(">>>>> Columns : " + wantedFields);
+    // System.out.println(">>>>> Response size: " + responseSize
+    // + " offset : "
+    // + offSet);
     WebResource webResource = null;
     webResource = client.resource(UNIPROT_SEARCH_ENDPOINT)
             .queryParam("format", "tab")
@@ -101,6 +103,12 @@ public class UniProtFTSRestClient extends FTSRestClient
   {
     FTSRestResponse searchResult = new FTSRestResponse();
     List<FTSData> result = null;
+    if (uniProtTabDelimittedResponseString == null
+            || uniProtTabDelimittedResponseString.trim().isEmpty())
+    {
+      searchResult.setNumberOfItemsFound(0);
+      return searchResult;
+    }
     String[] foundDataRow = uniProtTabDelimittedResponseString.split("\n");
     if (foundDataRow != null && foundDataRow.length > 0)
     {