X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Funiprot%2FUniProtFTSRestClient.java;h=250fba04f29ee14d01746ca198f5d65c6c8197cb;hb=2780a5c99798d048f690752f69a61c131e5e24d1;hp=a4f82cfd0b65f151056b32f54cbf4b89977c1ee5;hpb=7069dfb8eacf6405040429bb74ffc109706ddc49;p=jalview.git

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index a4f82cf..250fba0 100644
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -57,28 +57,29 @@ public class UniProtFTSRestClient extends FTSRestClient
       ClientConfig clientConfig = new DefaultClientConfig();
       Client client = Client.create(clientConfig);
 
-      String wantedFields = getDataColumnsFieldsAsCommaDelimitedString(uniportRestRequest
-              .getWantedFields());
-      int responseSize = (uniportRestRequest.getResponseSize() == 0) ? getDefaultResponsePageSize()
+      String wantedFields = getDataColumnsFieldsAsCommaDelimitedString(
+              uniportRestRequest.getWantedFields());
+      int responseSize = (uniportRestRequest.getResponseSize() == 0)
+              ? getDefaultResponsePageSize()
               : uniportRestRequest.getResponseSize();
 
       int offSet = uniportRestRequest.getOffSet();
+      String query;
+      if (isAdvancedQuery(uniportRestRequest.getSearchTerm()))
+      {
+        query = uniportRestRequest.getSearchTerm();
+      }
+      else
+      {
+        query = uniportRestRequest.getFieldToSearchBy()
+                .equalsIgnoreCase("Search All")
+                        ? uniportRestRequest.getSearchTerm()
+                                + " or mnemonic:"
+                                + uniportRestRequest.getSearchTerm()
+                        : uniportRestRequest.getFieldToSearchBy() + ":"
+                                + uniportRestRequest.getSearchTerm();
+      }
 
-      String query = uniportRestRequest.getFieldToSearchBy()
-              .equalsIgnoreCase("Search All") ? uniportRestRequest
-              .getSearchTerm()
-              + " or mnemonic:"
-              + uniportRestRequest
-              .getSearchTerm() : uniportRestRequest.getFieldToSearchBy()
-              + ":" + uniportRestRequest.getSearchTerm();
-
-      // + (uniportRestRequest.isAllowUnpublishedEntries() ? ""
-      // : " 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")
@@ -87,8 +88,8 @@ public class UniProtFTSRestClient extends FTSRestClient
               .queryParam("offset", String.valueOf(offSet))
               .queryParam("sort", "score").queryParam("query", query);
       // Execute the REST request
-      ClientResponse clientResponse = webResource.accept(
-              MediaType.TEXT_PLAIN).get(ClientResponse.class);
+      ClientResponse clientResponse = webResource
+              .accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
       String uniProtTabDelimittedResponseString = clientResponse
               .getEntity(String.class);
       // Make redundant objects eligible for garbage collection to conserve
@@ -102,8 +103,8 @@ public class UniProtFTSRestClient extends FTSRestClient
         throw new Exception(errorMessage);
 
       }
-      int xTotalResults = Integer.valueOf(clientResponse.getHeaders()
-              .get("X-Total-Results").get(0));
+      int xTotalResults = Integer.valueOf(
+              clientResponse.getHeaders().get("X-Total-Results").get(0));
       clientResponse = null;
       client = null;
       return parseUniprotResponse(uniProtTabDelimittedResponseString,
@@ -114,9 +115,8 @@ public class UniProtFTSRestClient extends FTSRestClient
       if (exceptionMsg.contains("SocketException"))
       {
         // No internet connection
-        throw new Exception(
-                MessageManager
-                        .getString("exception.unable_to_detect_internet_connection"));
+        throw new Exception(MessageManager.getString(
+                "exception.unable_to_detect_internet_connection"));
       }
       else if (exceptionMsg.contains("UnknownHostException"))
       {
@@ -131,6 +131,17 @@ public class UniProtFTSRestClient extends FTSRestClient
     }
   }
 
+  public boolean isAdvancedQuery(String query)
+  {
+    if (query.contains(" AND ") || query.contains(" OR ")
+            || query.contains(" NOT ") || query.contains(" ! ")
+            || query.contains(" || ") || query.contains(" && ")
+            || query.contains(":") || query.contains("-"))
+    {
+      return true;
+    }
+    return false;
+  }
 
   public FTSRestResponse parseUniprotResponse(
           String uniProtTabDelimittedResponseString,
@@ -148,14 +159,14 @@ public class UniProtFTSRestClient extends FTSRestClient
     if (foundDataRow != null && foundDataRow.length > 0)
     {
       result = new ArrayList<FTSData>();
-      String titleRow = getDataColumnsFieldsAsTabDelimitedString(uniprotRestRequest
-              .getWantedFields());
-      // System.out.println(">>>>Title row : " + titleRow);
+      boolean firstRow = true;
       for (String dataRow : foundDataRow)
       {
-        if (dataRow.equalsIgnoreCase(titleRow))
+        // The first data row is usually the header data. This should be
+        // filtered out from the rest of the data See: JAL-2485
+        if (firstRow)
         {
-          // System.out.println(">>>>>>>>>> matched!!!");
+          firstRow = false;
           continue;
         }
         // System.out.println(dataRow);
@@ -230,15 +241,16 @@ public class UniProtFTSRestClient extends FTSRestClient
           try
           {
             summaryRowData[colCounter++] = (field.getDataType()
-                    .getDataTypeClass() == Integer.class) ? Integer
-                    .valueOf(fieldData)
- : (field.getDataType()
-                    .getDataTypeClass() == Double.class) ? Double
-                            .valueOf(fieldData) : fieldData;
+                    .getDataTypeClass() == Integer.class)
+                            ? Integer.valueOf(fieldData.replace(",", ""))
+                            : (field.getDataType()
+                                    .getDataTypeClass() == Double.class)
+                                            ? Double.valueOf(fieldData)
+                                            : fieldData;
           } catch (Exception e)
           {
             e.printStackTrace();
-              System.out.println("offending value:" + fieldData);
+            System.out.println("offending value:" + fieldData);
           }
         }
       } catch (Exception e)
@@ -297,7 +309,6 @@ public class UniProtFTSRestClient extends FTSRestClient
     };
   }
 
-
   public static FTSRestClientI getInstance()
   {
     if (instance == null)