import jalview.exceptions.JalviewException;
import jalview.io.FastaFile;
import jalview.io.FileParse;
-import jalview.io.gff.SequenceOntology;
+import jalview.io.gff.SequenceOntologyFactory;
+import jalview.io.gff.SequenceOntologyI;
import jalview.schemes.ResidueProperties;
import jalview.util.DBRefUtils;
import jalview.util.MapList;
*/
public abstract class EnsemblSeqProxy extends EnsemblRestClient
{
+ private static final List<String> CROSS_REFERENCES = Arrays
+ .asList(new String[] { "CCDS" });
+
protected static final String CONSEQUENCE_TYPE = "consequence_type";
protected static final String PARENT = "Parent";
@Override
public AlignmentI getSequenceRecords(String query) throws Exception
{
- long now = System.currentTimeMillis();
// TODO use a String... query vararg instead?
// danger: accession separator used as a regex here, a string elsewhere
+ " chunks. Unexpected problem (" + r.getLocalizedMessage()
+ ")";
System.err.println(msg);
- if (alignment != null)
- {
- break; // return what we got
- }
- else
- {
- throw new JalviewException(msg, r);
- }
+ break;
+ // if (alignment != null)
+ // {
+ // break; // return what we got
+ // }
+ // else
+ // {
+ // throw new JalviewException(msg, r);
+ // }
}
}
addFeaturesAndProduct(accId, alignment);
}
- inProgress = false;
- System.out.println(getClass().getName() + " took "
- + (System.currentTimeMillis() - now) + "ms to fetch");
+ for (SequenceI seq : alignment.getSequences())
+ {
+ getCrossReferences(seq);
+ }
+
return alignment;
}
proteinSeq.createDatasetSequence();
querySeq.createDatasetSequence();
- getProteinCrossReferences(proteinSeq);
-
MapList mapList = mapCdsToProtein(querySeq, proteinSeq);
if (mapList != null)
{
* Get Uniprot and PDB xrefs from Ensembl, and attach them to the protein
* sequence
*
- * @param proteinSeq
+ * @param seq
*/
- protected void getProteinCrossReferences(SequenceI proteinSeq)
+ protected void getCrossReferences(SequenceI seq)
{
- while (proteinSeq.getDatasetSequence() != null)
+ while (seq.getDatasetSequence() != null)
{
- proteinSeq = proteinSeq.getDatasetSequence();
+ seq = seq.getDatasetSequence();
}
EnsemblXref xrefFetcher = new EnsemblXref();
- List<DBRefEntry> xrefs = xrefFetcher.getCrossReferences(
- proteinSeq.getName(), "PDB", "Uniprot/SPTREMBL",
- "Uniprot/SWISSPROT");
+ List<DBRefEntry> xrefs = xrefFetcher.getCrossReferences(seq.getName(),
+ getCrossReferenceDatabases());
for (DBRefEntry xref : xrefs)
{
- proteinSeq.addDBRef(xref);
+ seq.addDBRef(xref);
}
}
/**
+ * Returns a list of database names to be used when fetching cross-references.
+ *
+ * @return
+ */
+ protected List<String> getCrossReferenceDatabases()
+ {
+ return CROSS_REFERENCES;
+ }
+
+ /**
* Returns a mapping from dna to protein by inspecting sequence features of
* type "CDS" on the dna.
*
}
/**
- * Adds CDS ranges to the ranges list, and returns the total length mapped.
+ * Adds CDS ranges to the ranges list, and returns the total length mapped
+ * from.
*
- * No need to worry about reverse strand dna here since the retrieved sequence
- * is as transcribed (reverse complement for reverse strand), i.e in the same
- * sense as the peptide.
+ * No need to worry about reverse strand dna, here since the retrieved
+ * sequence is as transcribed (reverse complement for reverse strand), i.e in
+ * the same sense as the peptide.
*
* @param dnaSeq
* @param ranges
/*
* process a CDS feature (or a sub-type of CDS)
*/
- if (SequenceOntology.getInstance().isA(sf.getType(), SequenceOntology.CDS))
+ if (SequenceOntologyFactory.getInstance().isA(sf.getType(),
+ SequenceOntologyI.CDS))
{
int phase = 0;
try {
* the start position of the sequence we are mapping to
* @return
*/
- protected MapList getGenomicRanges(SequenceI sourceSequence,
+ protected MapList getGenomicRangesFromFeatures(SequenceI sourceSequence,
String accId, int start)
{
SequenceFeature[] sfs = sourceSequence.getSequenceFeatures();
*/
if (identifiesSequence(sf, accId))
{
- int strand = sf.getStrand();
-
- if (directionSet && strand != direction)
- {
- // abort - mix of forward and backward
+ int strand = sf.getStrand();
+ strand = strand == 0 ? 1 : strand; // treat unknown as forward
+
+ if (directionSet && strand != direction)
+ {
+ // abort - mix of forward and backward
System.err.println("Error: forward and backward strand for "
+ accId);
return null;
*/
Collections.sort(regions, new RangeSorter(direction == 1));
- List<int[]> to = new ArrayList<int[]>();
- to.add(new int[] { start, start + mappedLength - 1 });
+ List<int[]> to = Arrays.asList(new int[] { start,
+ start + mappedLength - 1 });
return new MapList(regions, to, 1, 1);
}
/*
* for sequence_variant, make an additional feature with consequence
*/
- if (SequenceOntology.getInstance().isSequenceVariant(sf.getType()))
+ if (SequenceOntologyFactory.getInstance().isA(sf.getType(),
+ SequenceOntologyI.SEQUENCE_VARIANT))
{
String consequence = (String) sf.getValue(CONSEQUENCE_TYPE);
if (consequence != null)
}
SequenceFeature[] sfs = sourceSequence.getSequenceFeatures();
- MapList mapping = getGenomicRanges(sourceSequence, accessionId,
+ MapList mapping = getGenomicRangesFromFeatures(sourceSequence, accessionId,
targetSequence.getStart());
if (mapping == null)
{
SequenceFeature[] sfs = sequence.getSequenceFeatures();
if (sfs != null) {
- SequenceOntology so = SequenceOntology.getInstance();
+ SequenceOntologyI so = SequenceOntologyFactory.getInstance();
for (SequenceFeature sf :sfs) {
if (so.isA(sf.getType(), type))
{
}
AlignmentUtils.transferFeatures(dnaSeq, peptide, dnaToProtein,
- SequenceOntology.EXON);
+ SequenceOntologyI.EXON);
LinkedHashMap<Integer, String[][]> variants = buildDnaVariantsMap(
dnaSeq, dnaToProtein);
String desc = StringUtils.listToDelimitedString(peptideVariants,
", ");
SequenceFeature sf = new SequenceFeature(
- SequenceOntology.SEQUENCE_VARIANT, desc, peptidePos,
+ SequenceOntologyI.SEQUENCE_VARIANT, desc, peptidePos,
peptidePos, 0f, null);
peptide.addSequenceFeature(sf);
count++;
* LinkedHashMap ensures we add the peptide features in sequence order
*/
LinkedHashMap<Integer, String[][]> variants = new LinkedHashMap<Integer, String[][]>();
- SequenceOntology so = SequenceOntology.getInstance();
+ SequenceOntologyI so = SequenceOntologyFactory.getInstance();
SequenceFeature[] dnaFeatures = dnaSeq.getSequenceFeatures();
if (dnaFeatures == null)
// not handling multi-locus variant features
continue;
}
- if (so.isSequenceVariant(sf.getType()))
+ if (so.isA(sf.getType(), SequenceOntologyI.SEQUENCE_VARIANT))
{
int[] mapsTo = dnaToProtein.locateInTo(dnaCol, dnaCol);
if (mapsTo == null)
public static boolean isTranscript(String featureType)
{
return NMD_VARIANT.equals(featureType)
- || SequenceOntology.getInstance().isA(featureType, SequenceOntology.TRANSCRIPT);
+ || SequenceOntologyFactory.getInstance().isA(featureType,
+ SequenceOntologyI.TRANSCRIPT);
}
}
git://source.jalview.org / jalview.git / blobdiff