X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblSequenceFetcher.java;h=9a4952e9082d87642432f920f6c208752fd1bea9;hb=deb6365c5607804ab43f8bb29e7d1a11f298789b;hp=67c5e6350970eac576d19fa8adf28b66935ef373;hpb=ef9282b464dc189faf9ce40a4b7420a204266668;p=jalview.git diff --git a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java index 67c5e63..9a4952e 100644 --- a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java +++ b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java @@ -12,9 +12,13 @@ import com.stevesoft.pat.Regex; */ abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl { - // TODO modify to accept other species e.g. ENSMUSTnnn + /* + * accepts ENSG/T/E/P with 11 digits + * or ENSMUSP or similar for other species + * or CCDSnnnnn.nn with at least 3 digits + */ private static final Regex ACCESSION_REGEX = new Regex( - "(ENSP|ENST|ENSG|CCDS)[0-9.]{3,}$"); + "(ENS([A-Z]{3}|)[GTEP]{1}[0-9]{11}$)" + "|" + "(CCDS[0-9.]{3,}$)"); /* * possible values for the 'feature' parameter of the /overlap REST service