From 98af16ccc5890b980f0c4f3acfb72d7128e3a6f0 Mon Sep 17 00:00:00 2001 From: jprocter Date: Fri, 30 Mar 2012 16:35:47 +0100 Subject: [PATCH] JAL-1062 - recognise and split off the range qualifier in a DAS sequence fetch query --- src/jalview/ws/dbsources/das/datamodel/DasSequenceSource.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 toks = new ArrayList(), src = new ArrayList(); + List toks = new ArrayList(), src = new ArrayList(),acIds=new ArrayList(); 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, DasSequenceAdapter>> resultset = new HashMap, 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 (" -- 1.7.10.2