X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Ffts%2Fservice%2Funiprot%2FUniProtFTSRestClient.java;h=a4f82cfd0b65f151056b32f54cbf4b89977c1ee5;hb=7069dfb8eacf6405040429bb74ffc109706ddc49;hp=04477156e45ccad5c8ed1cbe2ee0c0506c174ce9;hpb=b577ea70f354225426c5a5ecb8def7261e1cd3aa;p=jalview.git diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java index 0447715..a4f82cf 100644 --- 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) {