X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblSymbol.java;fp=src%2Fjalview%2Fext%2Fensembl%2FEnsemblSymbol.java;h=7862fce533239b75f1a894fc98867650383fd6c2;hb=3eb959d7f16b64260b8bec08d49b28ffc9670517;hp=671bfecbf3925edd28645282894791ae68289e1b;hpb=6ce6753f747f2b8872993e8355c2fa163b8c24b1;p=jalview.git diff --git a/src/jalview/ext/ensembl/EnsemblSymbol.java b/src/jalview/ext/ensembl/EnsemblSymbol.java index 671bfec..7862fce 100644 --- a/src/jalview/ext/ensembl/EnsemblSymbol.java +++ b/src/jalview/ext/ensembl/EnsemblSymbol.java @@ -42,6 +42,10 @@ import org.json.simple.parser.ParseException; */ public class EnsemblSymbol extends EnsemblXref { + private static final String GENE = "gene"; + private static final String TYPE = "type"; + private static final String ID = "id"; + /** * Constructor given the target domain to fetch data from * @@ -73,9 +77,9 @@ public class EnsemblSymbol extends EnsemblXref while (rvals.hasNext()) { JSONObject val = (JSONObject) rvals.next(); - String id = val.get("id").toString(); - String type = val.get("type").toString(); - if (id != null && "gene".equals(type)) + String id = val.get(ID).toString(); + String type = val.get(TYPE).toString(); + if (id != null && GENE.equals(type)) { result = id; break; @@ -105,7 +109,7 @@ public class EnsemblSymbol extends EnsemblXref StringBuilder sb = new StringBuilder(); sb.append(getDomain()).append("/xrefs/symbol/") .append(species.toString()).append("/").append(id) - .append("?content-type=application/json"); + .append(CONTENT_TYPE_JSON); for (String t : type) { sb.append("&object_type=").append(t); @@ -143,13 +147,14 @@ public class EnsemblSymbol extends EnsemblXref { if (taxon.isModelOrganism()) { - URL url = getUrl(query, taxon, "gene"); + URL url = getUrl(query, 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);