JAL-2101 JAL-2071 JAL-1563 Added fix to enable searching for old entry names in Unipr...

[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 0447715..a4f82cf 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -66,6 +66,9 @@ public class UniProtFTSRestClient extends FTSRestClient
 
       String query = uniportRestRequest.getFieldToSearchBy()
               .equalsIgnoreCase("Search All") ? uniportRestRequest
+              .getSearchTerm()
+              + " or mnemonic:"
+              + uniportRestRequest
               .getSearchTerm() : uniportRestRequest.getFieldToSearchBy()
               + ":" + uniportRestRequest.getSearchTerm();
 
@@ -226,9 +229,11 @@ public class UniProtFTSRestClient extends FTSRestClient
         {
           try
           {
-            summaryRowData[colCounter++] = (field.getDataColumnClass() == Integer.class) ? Integer
+            summaryRowData[colCounter++] = (field.getDataType()
+                    .getDataTypeClass() == Integer.class) ? Integer
                     .valueOf(fieldData)
-                    : (field.getDataColumnClass() == Double.class) ? Double
+ : (field.getDataType()
+                    .getDataTypeClass() == Double.class) ? Double
                             .valueOf(fieldData) : fieldData;
           } catch (Exception e)
           {