X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Futil%2FSequenceIdParser.java;h=8def26026d0fbecc168a4d847cea97205a2ba237;hb=34e555e6895d06fa5b7de6a646c37b0817efafc6;hp=7486d8a43359898f457f3f2c7aaadceccedf0325;hpb=813491b06a1cf8364202bfc803a4dcff8b89977c;p=jalview.git

diff --git a/forester/java/src/org/forester/util/SequenceIdParser.java b/forester/java/src/org/forester/util/SequenceIdParser.java
index 7486d8a..8def260 100644
--- a/forester/java/src/org/forester/util/SequenceIdParser.java
+++ b/forester/java/src/org/forester/util/SequenceIdParser.java
@@ -58,20 +58,75 @@ public final class SequenceIdParser {
                                                                          .compile( "(?:\\A|.*[^a-zA-Z0-9])([A-Z]{2}\\d{6})(?:[^a-zA-Z0-9]|\\Z)" );
     private final static Pattern GENBANK_PROTEIN_AC_PATTERN      = Pattern
                                                                          .compile( "(?:\\A|.*[^a-zA-Z0-9])([A-Z]{3}\\d{5})(?:[^a-zA-Z0-9]|\\Z)" );
-    private final static boolean DEBUG                           = false;
+    private final static boolean DEBUG                           = true;
 
     
-    
+    /**
+     * Returns null if no match.
+     * 
+     */
     public final static Identifier parse( final String s ) {
-        String v = DatabaseTools.parseGenbankAccessor( s );
+        String v = parseGenbankAccessor( s );
+        if ( !ForesterUtil.isEmpty( v ) ) {
+            return new Identifier( v, "ncbi" );
+        }
+        v = parseRefSeqAccessor( s );
         if ( !ForesterUtil.isEmpty( v ) ) {
-            return new Identifier( v, "genbank" );
+            return new Identifier( v, "ncbi" );
         }
-        
         return null;
     }
     
+    /**
+     * Returns null if no match.
+     * 
+     * @param query
+     * @param db 
+     * @return
+     */
+    static public String parseGenbankAccessor( final String query ) {
+        Matcher m = GENBANK_NUCLEOTIDE_AC_PATTERN_1.matcher( query );
+        if ( m.lookingAt() ) {
+            return m.group( 1 );
+        }
+        else {
+            m = GENBANK_NUCLEOTIDE_AC_PATTERN_2.matcher( query );
+            if ( m.lookingAt() ) {
+                return m.group( 1 );
+            }
+            else {
+                m = GENBANK_PROTEIN_AC_PATTERN.matcher( query );
+                if ( m.lookingAt() ) {
+                    return m.group( 1 );
+                }
+                else {
+                    return null;
+                }
+            }
+        }
+    }
     
+    public final static String parseRefSeqAccessor( final String query ) {
+        Matcher m = GENBANK_NUCLEOTIDE_AC_PATTERN_1.matcher( query );
+        if ( m.lookingAt() ) {
+            return m.group( 1 );
+        }
+        else {
+            m = GENBANK_NUCLEOTIDE_AC_PATTERN_2.matcher( query );
+            if ( m.lookingAt() ) {
+                return m.group( 1 );
+            }
+            else {
+                m = GENBANK_PROTEIN_AC_PATTERN.matcher( query );
+                if ( m.lookingAt() ) {
+                    return m.group( 1 );
+                }
+                else {
+                    return null;
+                }
+            }
+        }
+    }