JAL-1062 - recognise and split off the range qualifier in a DAS sequence fetch query

diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java
index 5c15390..22950f4 100644 (file)
--- a/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java
+++ b/src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java
@@ -124,10 +124,12 @@ public class DasSequenceSource extends DbSourceProxyImpl implements
   public AlignmentI getSequenceRecords(String queries) throws Exception\r
   {\r
     StringTokenizer st = new StringTokenizer(queries, "\t");\r
-    List<String> toks = new ArrayList<String>(), src = new ArrayList<String>();\r
+    List<String> toks = new ArrayList<String>(), src = new ArrayList<String>(),acIds=new ArrayList<String>();\r
     while (st.hasMoreTokens())\r
     {\r
-      toks.add(st.nextToken());\r
+      String t;\r
+      toks.add(t=st.nextToken());\r
+      acIds.add(t.replaceAll(":[0-9,]+", ""));\r
     }\r
     src.add(jsrc.getSourceURL());\r
     Map<String, Map<List<String>, DasSequenceAdapter>> resultset = new HashMap<String, Map<List<String>, DasSequenceAdapter>>();\r
@@ -164,7 +166,7 @@ public class DasSequenceSource extends DbSourceProxyImpl implements
           {\r
             String lbl = e.getId();\r
 \r
-            if (toks.indexOf(lbl) == -1)\r
+            if (acIds.indexOf(lbl) == -1)\r
             {\r
               System.err\r
                       .println("Warning - received sequence event for strange accession code ("\r