X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblSymbol.java;h=411a244f4c245a3fd0c2a908f0493a5e0cf5ae48;hb=916c073172d5e374f7375ec718420455472dfcb3;hp=75598a067e41c35150b7f4a39b11fc30ff9cb756;hpb=f10bde358291159a1d3c7d5b093a6cad907f5221;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblSymbol.java b/src/jalview/ext/ensembl/EnsemblSymbol.java
index 75598a0..411a244 100644
--- a/src/jalview/ext/ensembl/EnsemblSymbol.java
+++ b/src/jalview/ext/ensembl/EnsemblSymbol.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -42,6 +43,7 @@ import org.json.simple.parser.ParseException;
  */
 public class EnsemblSymbol extends EnsemblXref
 {
+  private static final String COLON = ":";
   private static final String GENE = "gene";
   private static final String TYPE = "type";
   private static final String ID = "id";
@@ -104,12 +106,11 @@ public class EnsemblSymbol extends EnsemblXref
    *          translation)
    * @return
    */
-  protected URL getUrl(String id, Species species, String... type)
+  protected URL getUrl(String id, String species, String... type)
   {
     StringBuilder sb = new StringBuilder();
-    sb.append(getDomain()).append("/xrefs/symbol/")
-            .append(species.toString()).append("/").append(id)
-            .append(CONTENT_TYPE_JSON);
+    sb.append(getDomain()).append("/xrefs/symbol/").append(species)
+            .append("/").append(id).append(CONTENT_TYPE_JSON);
     for (String t : type)
     {
       sb.append("&object_type=").append(t);
@@ -125,34 +126,33 @@ public class EnsemblSymbol extends EnsemblXref
   }
 
   /**
-   * Calls the Ensembl xrefs REST 'symbol' endpoint and retrieves any gene ids
-   * for the given identifier, for any known model organisms
+   * Calls the Ensembl xrefs REST 'symbol' endpoint and retrieves gene id(s) for
+   * the given identifier. If the identifier has the format species:symbol then
+   * the gene id for the specified species is returned, else any matched gene ids
+   * for model organisms. If lookup fails, the returned list is empty.
    * 
    * @param identifier
    * @return
    */
   public List<String> getGeneIds(String identifier)
   {
-    List<String> result = new ArrayList<String>();
-    List<String> ids = new ArrayList<String>();
-    ids.add(identifier);
+    List<String> result = new ArrayList<>();
+    List<String> ids = Collections.<String> emptyList();
+    List<String> species = getSpecies(identifier);
 
-    String[] queries = identifier.split(getAccessionSeparator());
+    String symbol = identifier.substring(identifier.indexOf(COLON) + 1);
     BufferedReader br = null;
     try
     {
-      for (String query : queries)
-      {
-        for (Species taxon : Species.getModelOrganisms())
+      for (String taxon : species)
         {
-          URL url = getUrl(query, taxon, GENE);
+        URL url = getUrl(symbol, taxon, GENE);
           if (url != null)
           {
             br = getHttpResponse(url, ids);
             if (br != null)
             {
               String geneId = parseSymbolResponse(br);
-              System.out.println(url + " returned " + geneId);
               if (geneId != null && !result.contains(geneId))
               {
                 result.add(geneId);
@@ -160,7 +160,6 @@ public class EnsemblSymbol extends EnsemblXref
             }
           }
         }
-      }
     } catch (IOException e)
     {
       // ignore
@@ -180,4 +179,27 @@ public class EnsemblSymbol extends EnsemblXref
     return result;
   }
 
+  /**
+   * Answers a list of species names which is
+   * <ul>
+   * <li>the species in the identifier if it is of the form species:symbol</li>
+   * <li>else a fixed list of 'model organism' species</li>
+   * </ul>
+   * 
+   * @param identifier
+   * @return
+   */
+  private List<String> getSpecies(String identifier)
+  {
+    int pos = identifier.indexOf(COLON);
+    if (pos > 0)
+    {
+      return Collections.singletonList(identifier.substring(0, pos));
+    }
+    else
+    {
+      return Species.getModelOrganisms();
+    }
+  }
+
 }