Merge branch 'bug/JAL-3807_jpred-with-slivka' into alpha/JAL-3066_Jalview_212_slivka...

[jalview.git] / src / jalview / ws / slivkaws / SlivkaWSInstance.java

diff --git a/src/jalview/ws/slivkaws/SlivkaWSInstance.java b/src/jalview/ws/slivkaws/SlivkaWSInstance.java
index 138b432..fa54cf0 100644 (file)
--- a/src/jalview/ws/slivkaws/SlivkaWSInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaWSInstance.java
@@ -28,6 +28,7 @@ import jalview.ws.params.ParamDatastoreI;
 import jalview.ws.params.ParamManager;
 import jalview.ws.params.WsParamSetI;
 import uk.ac.dundee.compbio.slivkaclient.FieldType;
+import uk.ac.dundee.compbio.slivkaclient.FileField;
 import uk.ac.dundee.compbio.slivkaclient.FormField;
 import uk.ac.dundee.compbio.slivkaclient.FormValidationException;
 import uk.ac.dundee.compbio.slivkaclient.JobState;
@@ -76,21 +77,34 @@ public abstract class SlivkaWSInstance extends ServiceWithParameters
           WsParamSetI preset, List<ArgumentI> args) throws Throwable
   {
     SlivkaForm form = service.getForm();
-    Optional<FormField> inputField = form.getFields().stream()
-            .filter(f -> f.getType() == FieldType.FILE).findFirst();
-    if (inputField.isPresent())
+    for (FormField field : form.getFields())
     {
-      StringBuilder builder = new StringBuilder();
-      for (SequenceI seq : sequences)
+      if (field.getType() == FieldType.FILE)
       {
-        builder.append(">").append(seq.getName()).append("\n")
-                .append(seq.getSequence()).append("\n");
+        FormatAdapter fa = new FormatAdapter();
+        fa.setNewlineString("\r\n");
+        FileField fileField = (FileField) field;
+        FileFormat format;
+        switch (fileField.getMediaType())
+        {
+        case "application/pfam":
+          format = FileFormat.Pfam;
+          break;
+        case "application/stockholm":
+          format = FileFormat.Stockholm;
+          break;
+        default:
+        case "application/fasta":
+          format = FileFormat.Fasta;
+          break;
+        }
+        InputStream stream = new ByteArrayInputStream(
+            fa.formatSequences(format, sequences.toArray(new SequenceI[0]))
+                .getBytes());
+        RemoteFile rf = client.uploadFile(stream, "input",
+            fileField.getMediaType());
+        form.insert(field.getName(), rf);
       }
-      InputStream stream = new ByteArrayInputStream(
-              builder.toString().getBytes());
-      RemoteFile file = client.uploadFile(stream, "input.fa",
-              "application/fasta");
-      form.insert(inputField.get().getName(), file);
     }
     if (args != null)
     {