package jalview.ws.slivkaws;
+
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
import jalview.io.DataSourceType;
import jalview.ws.params.ArgumentI;
import jalview.ws.params.InvalidArgumentException;
import jalview.ws.params.WsParamSetI;
-
import java.io.IOError;
import java.io.IOException;
import java.rmi.ServerError;
+import java.util.Collection;
import java.util.List;
-import compbio.data.msa.Category;
import uk.ac.dundee.compbio.slivkaclient.RemoteFile;
import uk.ac.dundee.compbio.slivkaclient.SlivkaClient;
import uk.ac.dundee.compbio.slivkaclient.SlivkaService;
@Override
public AlignmentI getAlignmentFor(JobId jobId) throws InvalidArgumentException, ServerError, IOError
{
+ Collection<RemoteFile> files;
try
{
- List<RemoteFile> files = client.getJobResults(jobId.getJobId());
+ var slivkaJob = client.getJob(jobId.getJobId());
+ files = slivkaJob.getResults();
for (RemoteFile f : files)
{
- if (f.getMimeType().equals("application/clustal")
- || f.getMimeType().equals("application/fasta"))
+ if (f.getMediaType().equals("application/clustal"))
+ {
+ return new FormatAdapter().readFile(f.getContentUrl().toString(), DataSourceType.URL, FileFormat.Clustal);
+ }
+ else if (f.getMediaType().equals("application/fasta"))
{
- return readAlignment(f);
+ return new FormatAdapter().readFile(f.getContentUrl().toString(), DataSourceType.URL, FileFormat.Fasta);
}
}
} catch (IOException e)