From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Fri, 30 Mar 2012 15:35:47 +0000 (+0100)
Subject: JAL-1062 - recognise and split off the range qualifier in a DAS sequence fetch query
X-Git-Tag: Jalview_2_9~532^2~29
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=98af16ccc5890b980f0c4f3acfb72d7128e3a6f0;p=jalview.git

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
--- 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
   {
     StringTokenizer st = new StringTokenizer(queries, "\t");
-    List<String> toks = new ArrayList<String>(), src = new ArrayList<String>();
+    List<String> toks = new ArrayList<String>(), src = new ArrayList<String>(),acIds=new ArrayList<String>();
     while (st.hasMoreTokens())
     {
-      toks.add(st.nextToken());
+      String t;
+      toks.add(t=st.nextToken());
+      acIds.add(t.replaceAll(":[0-9,]+", ""));
     }
     src.add(jsrc.getSourceURL());
     Map<String, Map<List<String>, DasSequenceAdapter>> resultset = new HashMap<String, Map<List<String>, DasSequenceAdapter>>();
@@ -164,7 +166,7 @@ public class DasSequenceSource extends DbSourceProxyImpl implements
           {
             String lbl = e.getId();
 
-            if (toks.indexOf(lbl) == -1)
+            if (acIds.indexOf(lbl) == -1)
             {
               System.err
                       .println("Warning - received sequence event for strange accession code ("