X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FWSWUBlastClient.java;h=0906d12fa49c8f16c401eacd374cce89a73c956f;hb=55e2e9b22b133db8b9ff0979b0338a33081fc8fd;hp=c221d074c6e5b9a65379129c3837ec1f2b29dffa;hpb=87fc98c92b4d1083db30212139b1137b508a0c86;p=jalview.git diff --git a/src/jalview/io/WSWUBlastClient.java b/src/jalview/io/WSWUBlastClient.java index c221d07..0906d12 100755 --- a/src/jalview/io/WSWUBlastClient.java +++ b/src/jalview/io/WSWUBlastClient.java @@ -29,7 +29,9 @@ import java.util.*; import javax.swing.*; import javax.xml.namespace.QName; +import jalview.analysis.AlignSeq; +import uk.ac.ebi.www.*; /** * DOCUMENT ME! @@ -39,38 +41,39 @@ import javax.xml.namespace.QName; */ public class WSWUBlastClient { + AlignmentPanel ap; + AlignmentI al; CutAndPasteTransfer output = new CutAndPasteTransfer(); int jobsRunning = 0; + Vector suggestedIds = new Vector(); /** * Creates a new WSWUBlastClient object. * * @param al DOCUMENT ME! * @param ids DOCUMENT ME! */ - public WSWUBlastClient(AlignmentI al, ArrayList ids) + public WSWUBlastClient(AlignmentPanel ap, AlignmentI al, ArrayList ids) { + this.ap = ap; + this.al = al; output.setText( - "To display sequence features an exact Uniprot id with 100% sequence identity match must be entered." + - "\nIn order to display these features, try changing the names of your sequences to the ids suggested below."); + "To display sequence features an exact Uniprot id with 100% sequence identity match must be entered." + +"\nIn order to display these features, try changing the names of your sequences to the ids suggested below." + +"\n\nRunning WSWUBlast at EBI." + +"\nPlease quote Pillai S., Silventoinen V., Kallio K., Senger M., Sobhany S., Tate J., Velankar S., Golovin A., Henrick K., Rice P., Stoehr P., Lopez R." + +"\nSOAP-based services provided by the European Bioinformatics Institute." + +"\nNucleic Acids Res. 33(1):W25-W28 (2005));"); + Desktop.addInternalFrame(output, "BLASTing for unidentified sequences ", 800, 300); for (int i = 0; i < ids.size(); i++) { - SequenceI sequence = al.findName(ids.get(i).toString()); - StringBuffer nonGapped = new StringBuffer(); - - for (int n = 0; n < sequence.getSequence().length(); n++) - { - if (!jalview.util.Comparison.isGap(sequence.getCharAt(n))) - { - nonGapped.append(sequence.getCharAt(n)); - } - } + Sequence sequence = (Sequence)ids.get(i); + System.out.println(sequence.getName()); - BlastThread thread = new BlastThread(ids.get(i).toString(), - nonGapped.toString()); + BlastThread thread = new BlastThread(sequence); thread.start(); jobsRunning++; } @@ -79,50 +82,100 @@ public class WSWUBlastClient thread.start(); } + /** * DOCUMENT ME! * * @param id1 DOCUMENT ME! * @param res DOCUMENT ME! */ - void parseResult(String id1, String res) + void parseResult(Sequence seq, String res) { StringTokenizer st = new StringTokenizer(res, "\n"); String data; String id2; int maxFound = 90; - StringBuffer buffer = new StringBuffer("\n\n" + id1 + " :"); + StringBuffer buffer = new StringBuffer("\n\n" + seq.getName() + " :"); while (st.hasMoreTokens()) { data = st.nextToken(); - if (data.indexOf("database=\"uniprot\" id=") > -1) + if (data.indexOf(">UNIPROT") > -1) { - int index = data.indexOf("database=\"uniprot\" id=") + 23; - id2 = data.substring(index, data.indexOf("\"", index)); + int index = data.indexOf(">UNIPROT") + 9; + id2 = data.substring(index, data.indexOf(" ", index)); - while (data.indexOf("") == -1) + boolean identitiesFound = false; + while (!identitiesFound) { data = st.nextToken(); - if (data.indexOf("") > -1) + if (data.indexOf("Identities") > -1) { - int value = Integer.parseInt(data.substring(data.indexOf( - "") + 10, - data.indexOf(""))); + identitiesFound = true; + + int value = Integer.parseInt(data.substring(data.indexOf( + "(") + 1, + data.indexOf("%"))); if (value >= maxFound) { maxFound = value; buffer.append(" " + id2 + " " + value + "%; "); + suggestedIds.addElement( new Object[]{seq, id2}); } } } } } - output.setText(output.getText() + buffer.toString()); + output.appendText(buffer.toString()); + } + + void updateIds() + { + // This must be outside the run() body as java 1.5 + // will not return any value from the OptionPane to the expired thread. + int reply = JOptionPane.showConfirmDialog( + Desktop.desktop, "Automatically update suggested ids?", + "Auto replace sequence ids", JOptionPane.YES_NO_OPTION); + + if (reply == JOptionPane.YES_OPTION) + { + Enumeration keys = suggestedIds.elements(); + while(keys.hasMoreElements()) + { + Object [] object = (Object[])keys.nextElement(); + + Sequence oldseq = (Sequence)object[0]; + + oldseq.setName( object[1].toString() ); + + // Oldseq is actually in the dataset, we must find the + // Visible seq and change its name also. + for (int i = 0; i < al.getHeight(); i++) + { + if (al.getSequenceAt(i).getDatasetSequence() == oldseq) + { + al.getSequenceAt(i).setName(oldseq.getName()); + break; + } + } + + Vector entries = oldseq.getDBRef(); + if (entries != null) + { + DBRefEntry entry = (DBRefEntry) entries.elementAt(0); + oldseq.addDBRef(new jalview.datamodel. + DBRefEntry("UNIPROT", + "0", + entry.getAccessionId())); + } + } + } + ap.repaint(); + } class ImageTwirler extends Thread @@ -163,20 +216,24 @@ public class WSWUBlastClient { } } + + if (jobsRunning == 0) + { + updateIds(); + } } } class BlastThread extends Thread { - String sequence; - String seqid; + Sequence sequence; String jobid; boolean jobComplete = false; - BlastThread(String id, String sequence) + BlastThread(Sequence sequence) { - this.sequence = sequence; - seqid = id; + System.out.println("blasting for: "+sequence.getName()); + this.sequence = sequence; } public void run() @@ -187,27 +244,23 @@ public class WSWUBlastClient { try { - Call call = (Call) new Service().createCall(); - call.setTargetEndpointAddress(new java.net.URL( - "http://www.ebi.ac.uk/cgi-bin/webservices/WSWUBlast")); - call.setOperationName(new QName("WSWUBlast", "polljob")); - - String result = (String) call.invoke(new Object[] - { - jobid, "xml" - }); - - if ((result.indexOf("JOB PENDING") == -1) && - (result.indexOf("JOB RUNNING") == -1)) - { - parseResult(seqid, result); - jobComplete = true; - jobsRunning--; - } - - Thread.sleep(5000); - - // System.out.println("WSWuBlastClient: I'm alive "+seqid+" "+jobid); // log.debug + WSWUBlastService service = new WSWUBlastServiceLocator(); + WSWUBlast wublast = service.getWSWUBlast(); + WSFile[] results = wublast.getResults(jobid); + + if(results!=null) + { + String result = new String(wublast.poll(jobid, "tooloutput")); + parseResult(sequence, result); + jobComplete = true; + jobsRunning--; + } + else + { + Thread.sleep(10000); + System.out.println("WSWuBlastClient: I'm alive " + + sequence.getName() + " " + jobid); // log.debug + } } catch (Exception ex) { @@ -217,38 +270,36 @@ public class WSWUBlastClient void StartJob() { - HashMap params = new HashMap(); - params.put("database", "uniprot"); - params.put("sensitivity", "low"); - params.put("sort", "totalscore"); - params.put("matrix", "pam10"); - params.put("program", "blastp"); - params.put("alignments", "5"); - params.put("outformat", "xml"); - params.put("searchtype", "1"); - - byte[] seqbytes = sequence.getBytes(); + InputParams params = new InputParams(); + + params.setProgram("blastp"); + params.setDatabase("uniprot"); + params.setMatrix("pam10"); + + params.setNumal(5); + params.setSensitivity("low"); + params.setSort("totalscore"); + params.setOutformat("txt"); + params.setAsync(true); try { - Call call = (Call) new Service().createCall(); - call.setTargetEndpointAddress(new java.net.URL( - "http://www.ebi.ac.uk/cgi-bin/webservices/WSWUBlast")); - call.setOperationName(new QName("WSWUBlast", "doWUBlast")); - - String result = (String) call.invoke(new Object[] - { - params, seqbytes - }); - jobid = result; - System.out.println( - "http://www.ebi.ac.uk/cgi-bin/webservices/WSWUBlast JobId '" + - jobid + "'"); + Data inputs[] = new Data[1]; + Data input= new Data(); + input.setType("sequence"); + input.setContent(AlignSeq.extractGaps("-. ",sequence.getSequence())); + inputs[0]=input; + + WSWUBlastService service = new WSWUBlastServiceLocator(); + WSWUBlast wublast = service.getWSWUBlast(); + jobid = wublast.runWUBlast(params, inputs); } catch (Exception exp) { - System.err.println("WSWUBlastClient error:\n" + exp.toString()); - exp.printStackTrace(); + jobComplete = true; + jobsRunning--; + System.err.println("WSWUBlastClient error:\n" + exp.toString()); + exp.printStackTrace(); } } }