X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblGene.java;h=24e3e955fe442972c96f99ae6257cfaa0fecfa14;hb=4324ab9c09ac74782aef9493b98280060bccd5e8;hp=0bc6a74c13258a2155de67bd4a009fe6666ccd0a;hpb=a61896507a80dd6dcafaee02a872678022afe943;p=jalview.git
diff --git a/src/jalview/ext/ensembl/EnsemblGene.java b/src/jalview/ext/ensembl/EnsemblGene.java
index 0bc6a74..24e3e95 100644
--- a/src/jalview/ext/ensembl/EnsemblGene.java
+++ b/src/jalview/ext/ensembl/EnsemblGene.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ext.ensembl;
import jalview.api.FeatureColourI;
@@ -8,10 +28,9 @@ import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.io.gff.SequenceOntologyFactory;
import jalview.io.gff.SequenceOntologyI;
-import jalview.schemes.FeatureColourAdapter;
+import jalview.schemes.FeatureColour;
import jalview.schemes.FeatureSettingsAdapter;
import jalview.util.MapList;
-import jalview.util.StringUtils;
import java.awt.Color;
import java.io.UnsupportedEncodingException;
@@ -101,59 +120,95 @@ public class EnsemblGene extends EnsemblSeqProxy
*
*
* @param query
- * one or more identifiers separated by a space
- * @return an alignment containing one or more genes, and possibly
- * transcripts, or null
+ * a single gene or transcript identifier or gene name
+ * @return an alignment containing a gene, and possibly transcripts, or null
*/
@Override
public AlignmentI getSequenceRecords(String query) throws Exception
{
- // todo: tidy up handling of one or multiple accession ids
- String[] queries = query.split(getAccessionSeparator());
-
/*
- * if given a transcript id, look up its gene parent
+ * convert to a non-duplicated list of gene identifiers
*/
- if (isTranscriptIdentifier(query))
+ List geneIds = getGeneIds(query);
+
+ AlignmentI al = null;
+ for (String geneId : geneIds)
{
- // we are assuming all transcripts have the same gene parent here
- query = new EnsemblLookup(getDomain()).getParent(queries[0]);
- if (query == null)
+ /*
+ * fetch the gene sequence(s) with features and xrefs
+ */
+ AlignmentI geneAlignment = super.getSequenceRecords(geneId);
+ if (geneAlignment == null)
{
- return null;
+ continue;
+ }
+ if (geneAlignment.getHeight() == 1)
+ {
+ getTranscripts(geneAlignment, geneId);
+ }
+ if (al == null)
+ {
+ al = geneAlignment;
+ }
+ else
+ {
+ al.append(geneAlignment);
}
}
+ return al;
+ }
- /*
- * if given a gene or other external name, lookup and fetch
- * the corresponding gene for all model organisms
- */
- if (!isGeneIdentifier(query))
+ /**
+ * Converts a query, which may contain one or more gene or transcript
+ * identifiers, into a non-redundant list of gene identifiers.
+ *
+ * @param accessions
+ * @return
+ */
+ List getGeneIds(String accessions)
+ {
+ List geneIds = new ArrayList();
+
+ for (String acc : accessions.split(getAccessionSeparator()))
{
- List geneIds = new EnsemblSymbol(getDomain()).getIds(query);
- if (geneIds.isEmpty())
+ if (isGeneIdentifier(acc))
{
- return null;
+ if (!geneIds.contains(acc))
+ {
+ geneIds.add(acc);
+ }
}
- String theIds = StringUtils.listToDelimitedString(geneIds,
- getAccessionSeparator());
- return getSequenceRecords(theIds);
- }
- /*
- * fetch the gene sequence(s) with features and xrefs
- */
- AlignmentI al = super.getSequenceRecords(query);
+ /*
+ * if given a transcript id, look up its gene parent
+ */
+ else if (isTranscriptIdentifier(acc))
+ {
+ String geneId = new EnsemblLookup(getDomain()).getParent(acc);
+ if (geneId != null && !geneIds.contains(geneId))
+ {
+ geneIds.add(geneId);
+ }
+ }
- /*
- * if we retrieved a single gene, get its transcripts as well
- */
- if (al.getHeight() == 1)
- {
- getTranscripts(al, query);
+ /*
+ * if given a gene or other external name, lookup and fetch
+ * the corresponding gene for all model organisms
+ */
+ else
+ {
+ List ids = new EnsemblSymbol(getDomain(), getDbSource(),
+ getDbVersion()).getIds(acc);
+ for (String geneId : ids)
+ {
+ if (!geneIds.contains(geneId))
+ {
+ geneIds.add(geneId);
+ }
+ }
+ }
}
-
- return al;
+ return geneIds;
}
/**
@@ -165,7 +220,8 @@ public class EnsemblGene extends EnsemblSeqProxy
*/
protected String getGeneIdentifiersForName(String query)
{
- List ids = new EnsemblSymbol(getDomain()).getIds(query);
+ List ids = new EnsemblSymbol(getDomain(), getDbSource(),
+ getDbVersion()).getIds(query);
if (ids != null)
{
for (String id : ids)
@@ -226,8 +282,7 @@ public class EnsemblGene extends EnsemblSeqProxy
}
}
gene.setSequenceFeatures(filtered
- .toArray(new SequenceFeature[filtered
- .size()]));
+ .toArray(new SequenceFeature[filtered.size()]));
}
}
@@ -493,6 +548,7 @@ public class EnsemblGene extends EnsemblSeqProxy
return new FeatureSettingsAdapter()
{
SequenceOntologyI so = SequenceOntologyFactory.getInstance();
+
@Override
public boolean isFeatureDisplayed(String type)
{
@@ -505,7 +561,7 @@ public class EnsemblGene extends EnsemblSeqProxy
{
if (so.isA(type, SequenceOntologyI.EXON))
{
- return new FeatureColourAdapter()
+ return new FeatureColour()
{
@Override
public boolean isColourByLabel()
@@ -516,7 +572,7 @@ public class EnsemblGene extends EnsemblSeqProxy
}
if (so.isA(type, SequenceOntologyI.SEQUENCE_VARIANT))
{
- return new FeatureColourAdapter()
+ return new FeatureColour()
{
@Override