X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FEmblCdsSouce.java;h=14992453c43e0573e028796b1b559fd453f57409;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=d44883077674e9abb6c9834787e7e428b20791e6;hpb=6b406c397d41a0f2d84b75f13e7ab478932bf57d;p=jalview.git

diff --git a/src/jalview/ws/dbsources/EmblCdsSouce.java b/src/jalview/ws/dbsources/EmblCdsSouce.java
index d448830..1499245 100644
--- a/src/jalview/ws/dbsources/EmblCdsSouce.java
+++ b/src/jalview/ws/dbsources/EmblCdsSouce.java
@@ -1,62 +1,95 @@
-package jalview.ws.dbsources;
-
-import java.util.Hashtable;
-
-import com.stevesoft.pat.Regex;
-
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.DBRefSource;
-import jalview.ws.seqfetcher.DbSourceProxy;
-
-public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
-{
-
-  public EmblCdsSouce() {
-    super();
-    addDbSourceProperty(DBRefSource.CODINGSEQDB); 
-  }
-  
-  public String getAccessionSeparator()
-  {
-   return null;
-  }
-
-  public Regex getAccessionValidator()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public String getDbSource()
-  {
-    return DBRefSource.EMBLCDS;
-  }
-
-  public String getDbVersion()
-  {
-    return "0"; // TODO : this is dynamically set for a returned record - not tied to proxy
-  }
-
-  public AlignmentI getSequenceRecords(String queries) throws Exception
-  { 
-    if (queries.indexOf(".")>-1)
-    {
-      queries = queries.substring(0, queries.indexOf("."));
-    }
-    return getEmblSequenceRecords(DBRefSource.EMBLCDS, queries);
-  }
-
-  public boolean isValidReference(String accession)
-  {
-    // TODO Auto-generated method stub
-    return true;
-  }
-  /**
-   * cDNA for LDHA_CHICK swissprot sequence
-   */
-  public String getTestQuery()
-  {
-    return "CAA37824";
-  }
-
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.ws.dbsources;
+
+import com.stevesoft.pat.Regex;
+
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.DBRefSource;
+import jalview.ws.seqfetcher.DbSourceProxy;
+
+public class EmblCdsSouce extends EmblXmlSource implements DbSourceProxy
+{
+
+  public EmblCdsSouce()
+  {
+    super();
+    addDbSourceProperty(DBRefSource.CODINGSEQDB);
+  }
+
+  public String getAccessionSeparator()
+  {
+    return null;
+  }
+
+  public Regex getAccessionValidator()
+  {
+    return new com.stevesoft.pat.Regex("^[A-Z]+[0-9]+");
+  }
+
+  public String getDbSource()
+  {
+    return DBRefSource.EMBLCDS;
+  }
+
+  public String getDbVersion()
+  {
+    return "0"; // TODO : this is dynamically set for a returned record - not
+    // tied to proxy
+  }
+
+  public AlignmentI getSequenceRecords(String queries) throws Exception
+  {
+    if (queries.indexOf(".") > -1)
+    {
+      queries = queries.substring(0, queries.indexOf("."));
+    }
+    return getEmblSequenceRecords(DBRefSource.EMBLCDS, queries);
+  }
+
+  public boolean isValidReference(String accession)
+  {
+    // most embl CDS refs look like ..
+    // TODO: improve EMBLCDS regex
+    return (accession == null || accession.length() < 2) ? false
+            : getAccessionValidator().search(accession);
+  }
+
+  /**
+   * cDNA for LDHA_CHICK swissprot sequence
+   */
+  public String getTestQuery()
+  {
+    return "CAA37824";
+  }
+
+  public String getDbName()
+  {
+    return "EMBL (CDS)";
+  }
+
+  @Override
+  public int getTier()
+  {
+    return 0;
+  }
+
+}