X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fslivkaws%2FSlivkaJPredServiceInstance.java;h=b8e4d2f2e47da35f177e99cd17c64be70fcd6f5c;hb=475667344d979c2cc3d1d677117568b608579aa1;hp=a614f020558ed04904ce6e8f745d478fc3e07205;hpb=992a0adb0deed8313fde7cad88837355336e58a5;p=jalview.git diff --git a/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java index a614f02..b8e4d2f 100644 --- a/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java +++ b/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java @@ -6,6 +6,8 @@ import java.util.List; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceI; +import jalview.io.DataSourceType; +import jalview.io.JPredFile; import jalview.ws.api.JPredMutlipleAlignmentServiceI; import jalview.ws.api.JobId; import uk.ac.dundee.compbio.slivkaclient.RemoteFile; @@ -30,18 +32,36 @@ public class SlivkaJPredServiceInstance extends SlivkaWSInstance } @Override - public AlignmentI getResult(JobId jobId) throws Exception + public AlignmentI getAlignment(JobId jobId) throws Exception { List files; try { files = client.getJobResults(jobId.getJobId()); for (RemoteFile f : files) { - return readAlignment(f); + var alignment = readAlignment(f); + if (alignment != null) + { + return alignment; + } } } catch (IOException e) { throw new IOError(e); } - return null; + return null; + } + + @Override + public JPredFile getPrediction(JobId jobId) throws Exception + { + List files = client.getJobResults(jobId.getJobId()); + for (RemoteFile f : files) + { + if (f.getLabel().equals("concise")) + { + return new JPredFile(f.getURL(), DataSourceType.URL); + } + } + return null; } }