X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblCdna.java;h=f60125b94b97bdef9237ed8a57e017a463680d52;hb=4b3e12d9f3c2e2ad8a0317160881cef075690e97;hp=757b3c80741a90061de09dc168d549a52164fbb9;hpb=a23cc416cd520ac6dec6052591575b264f5d25bc;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblCdna.java b/src/jalview/ext/ensembl/EnsemblCdna.java
index 757b3c8..f60125b 100644
--- a/src/jalview/ext/ensembl/EnsemblCdna.java
+++ b/src/jalview/ext/ensembl/EnsemblCdna.java
@@ -1,13 +1,28 @@
 package jalview.ext.ensembl;
 
-import jalview.ext.ensembl.SeqFetcher.EnsemblSeqType;
+import jalview.datamodel.SequenceFeature;
+import jalview.io.gff.SequenceOntologyFactory;
+import jalview.io.gff.SequenceOntologyI;
+
+import java.util.List;
 
 import com.stevesoft.pat.Regex;
 
 public class EnsemblCdna extends EnsemblSeqProxy
 {
+  // TODO modify to accept other species e.g. ENSMUSPnnn
+  private static final Regex ACCESSION_REGEX = new Regex(
+          "(ENST|ENSG|CCDS)[0-9.]{3,}$");
+  
+  /*
+   * fetch exon features on genomic sequence (to identify the cdna regions)
+   * and cds and variation features (to retain)
+   */
+  private static final EnsemblFeatureType[] FEATURES_TO_FETCH = {
+      EnsemblFeatureType.exon, EnsemblFeatureType.cds,
+      EnsemblFeatureType.variation };
 
-  public EnsemblCdna() throws Exception
+  public EnsemblCdna()
   {
     super();
   }
@@ -27,13 +42,55 @@ public class EnsemblCdna extends EnsemblSeqProxy
   @Override
   public Regex getAccessionValidator()
   {
-    return new Regex("((ENST|ENSG|CCDS)[0-9.]{3,})");
+    return ACCESSION_REGEX;
+  }
+
+  @Override
+  protected EnsemblFeatureType[] getFeaturesToFetch()
+  {
+    return FEATURES_TO_FETCH;
+  }
+
+  /**
+   * Answers true unless the feature type is 'transcript' (or a sub-type in the
+   * Sequence Ontology).
+   */
+  @Override
+  protected boolean retainFeature(SequenceFeature sf, String accessionId)
+  {
+    if (isTranscript(sf.getType()))
+    {
+      return false;
+    }
+    return featureMayBelong(sf, accessionId);
+  }
+
+  /**
+   * Answers true if the sequence feature type is 'exon' (or a subtype of exon
+   * in the Sequence Ontology), and the Parent of the feature is the transcript
+   * we are retrieving
+   */
+  @Override
+  protected boolean identifiesSequence(SequenceFeature sf, String accId)
+  {
+    if (SequenceOntologyFactory.getInstance().isA(sf.getType(),
+            SequenceOntologyI.EXON))
+    {
+      String parentFeature = (String) sf.getValue(PARENT);
+      if (("transcript:" + accId).equals(parentFeature))
+      {
+        return true;
+      }
+    }
+    return false;
   }
 
   @Override
-  public String getTestQuery()
+  protected List<String> getCrossReferenceDatabases()
   {
-    return "ENST00000288602";
+    return super.getCrossReferenceDatabases();
+    // 30/01/16 also found Vega_transcript, OTTT, ENS_LRG_transcript, UCSC,
+    // HGNC_trans_name, RefSeq_mRNA, RefSeq_mRNA_predicted
   }
 
 }