wsInfo = new jalview.gui.WebserviceInfo(WebServiceJobTitle, WebServiceReference);
- wsInfo.setProgressText("Alignment of "+altitle+"\nJob details\n");
+ wsInfo.setProgressText(((submitGaps) ? "Re-alignment" : "Alignment")+" of "+altitle+"\nJob details\n");
// TODO: MuscleWS transmuted to generic MsaWS client
MuscleWSServiceLocator loc = new MuscleWSServiceLocator(); // Default
try {
this.server = (MuscleWS) loc.getMuscleWS(new java.net.URL(WsURL));
+ ((MuscleWSSoapBindingStub) this.server).setTimeout(60000); // One minute timeout
}
catch (Exception ex) {
wsInfo.setProgressText("Serious! "+WebServiceName+" Service location failed\nfor URL :"
wsInfo.setStatus(wsInfo.ERROR);
ex.printStackTrace();
}
-
+ loc.getEngine().setOption("axis","1");
MsaWSThread musclethread = new MsaWSThread(WebServiceName+" alignment of "+altitle, msa, submitGaps, preserveOrder);
wsInfo.setthisService(musclethread);
musclethread.start();
seqarray[i] = new vamsas.objects.simple.Sequence();
seqarray[i].setId(newname);
seqarray[i].setSeq((submitGaps) ? msa[i].getSequence()
- : AlignSeq.extractGaps("-. ", msa[i].getSequence()));
+ : AlignSeq.extractGaps(jalview.util.Comparison.GapChars, msa[i].getSequence()));
}
this.seqs = new vamsas.objects.simple.SequenceSet();
boolean jobComplete = false;
public void cancelJob() {
- if (!jobComplete) {
+ if (jobId!=null && !jobId.equals("") && !jobComplete) {
String cancelledMessage="";
try {
vamsas.objects.simple.WsJobId cancelledJob = server.cancel(jobId);
exc.printStackTrace();
}
wsInfo.setProgressText(OutputHeader + cancelledMessage+"\n");
+ } else {
+ if (!jobComplete)
+ {
+ wsInfo.setProgressText(OutputHeader + "Server cannot cancel this job because it has not been submitted properly. just close the window.\n");
+ }
}
}
{
try
{
- result = server.getResult(jobId);
+ if ((result = server.getResult(jobId))==null)
+ throw(new Exception("Timed out when communicating with server\nTry again later.\n"));
if (result.isRunning())
wsInfo.setStatus(WebserviceInfo.STATE_RUNNING);
allowedServerExceptions--;
wsInfo.appendProgressText("\n" + ServiceName + " Server exception!\n" +
ex.getMessage());
- ex.printStackTrace();
+ System.err.println(ServiceName + " Server exception: " +
+ ex.getMessage());
+ // ex.printStackTrace(); JBPNote Debug
+ try
+ {
+ if (allowedServerExceptions>0)
+ Thread.sleep(5000);
+ }
+ catch (InterruptedException ex1)
+ {
+ }
+
}
}
if (allowedServerExceptions == 0)
try
{
vamsas.objects.simple.WsJobId jobsubmit = server.align(seqs);
- if (jobsubmit.getStatus()==1) {
+ if (jobsubmit!=null && jobsubmit.getStatus()==1) {
jobId=jobsubmit.getJobId();
System.out.println(WsURL+" Job Id '"+jobId+"'");
} else {
+ if (jobsubmit == null) {
+ throw new Exception("Server at "+WsURL+" returned null object, it probably cannot be contacted. Try again later ?");
+ }
throw new Exception(jobsubmit.getJobId());
}
}
catch (Exception e)
{
- System.err.println(ServiceName + " Client: Failed to submit the prediction\n" +
+ // TODO: JBPNote catch timeout or other fault types explicitly
+ // For unexpected errors
+ System.err.println(WebServiceName + " Client: Failed to submit the sequences for alignment.\n"+WsURL+" : " +
e.toString() + "\n");
- e.printStackTrace();
+ this.allowedServerExceptions=0;
+ wsInfo.setStatus(wsInfo.STATE_STOPPED_SERVERERROR);
+ wsInfo.appendProgressText("Server problems! "+e.toString()+"\nFailed to submit sequences for alignment. Just close the window\n");
+ // e.printStackTrace(); // TODO: JBPNote DEBUG
}
}