Bugfix parsing on seurat multi-valued params

Author: bbimber

singlecell/api-src/org/labkey/api/singlecell/pipeline/AbstractSingleCellPipelineStep.java

@@ -324,6 +324,11 @@ else if ("sequenceanalysis-trimmingtextarea".equals(pd.getFieldXtype()))
             String[] vals = val.split(",");
             return "c('" + StringUtils.join(vals, "','") + "')";
         }
+        else if (pd.isMultiValue())
+        {
+            String[] vals = val.split(pd.getDelimiter());
+            return "c('" + StringUtils.join(vals, "','") + "')";
+        }
 
         return  "'" + val + "'";
     }

singlecell/api-src/org/labkey/api/singlecell/pipeline/SeuratToolParameter.java

@@ -11,23 +11,31 @@ public class SeuratToolParameter extends ToolParameterDescriptor
 {
     private String _rName;
     private boolean _includeIfEmptyOrNull;
+    private String _delimiter = ";";
+    private boolean _isMultiValue;
 
-    public SeuratToolParameter(String name, String label, String description, String fieldXtype, @Nullable Object defaultValue, @Nullable JSONObject additionalExtConfig, String rName, boolean includeIfEmptyOrNull)
+    public SeuratToolParameter(String name, String label, String description, String fieldXtype, @Nullable Object defaultValue, @Nullable JSONObject additionalExtConfig, String rName, boolean includeIfEmptyOrNull, boolean isMultiValue)
     {
         super(null, name, label, description, fieldXtype, defaultValue, additionalExtConfig);
 
         _rName = rName;
         _includeIfEmptyOrNull = includeIfEmptyOrNull;
+        _isMultiValue = isMultiValue;
     }
 
     public static SeuratToolParameter create(String name, String label, String description, String fieldXtype, @Nullable JSONObject additionalExtConfig, @Nullable Object defaultValue)
     {
-        return new SeuratToolParameter(name, label, description, fieldXtype, defaultValue, additionalExtConfig, null, true);
+        return new SeuratToolParameter(name, label, description, fieldXtype, defaultValue, additionalExtConfig, null, true, false);
     }
 
     public static SeuratToolParameter create(String name, String label, String description, String fieldXtype, @Nullable JSONObject additionalExtConfig, @Nullable Object defaultValue, String rName, boolean includeIfEmptyOrNull)
     {
-        return new SeuratToolParameter(name, label, description, fieldXtype, defaultValue, additionalExtConfig, rName, includeIfEmptyOrNull);
+        return SeuratToolParameter.create(name, label, description, fieldXtype, additionalExtConfig, defaultValue, rName, includeIfEmptyOrNull, false);
+    }
+
+    public static SeuratToolParameter create(String name, String label, String description, String fieldXtype, @Nullable JSONObject additionalExtConfig, @Nullable Object defaultValue, String rName, boolean includeIfEmptyOrNull, boolean isMultiValue)
+    {
+        return new SeuratToolParameter(name, label, description, fieldXtype, defaultValue, additionalExtConfig, rName, includeIfEmptyOrNull, isMultiValue);
     }
 
     public String getVariableName()
@@ -44,4 +52,14 @@ public boolean shouldIncludeInMarkdown(PipelineJob job, PipelineStepProvider pro
 
         return true;
     }
+
+    public boolean isMultiValue()
+    {
+        return _isMultiValue;
+    }
+
+    public String getDelimiter()
+    {
+        return _delimiter;
+    }
 }

singlecell/src/org/labkey/singlecell/pipeline/singlecell/FindMarkers.java

@@ -37,7 +37,7 @@ public Provider()
                         put("initialValues", "wilcox;MAST;DESeq2");
                         put("delimiter", ";");
                         put("joinReturnValue", true);
-                    }}, null),
+                    }}, null, null, false, true),
                     SeuratToolParameter.create("pValThreshold", "pVal Threshold", "Only genes with adjusted p-values below this will be reported", "ldk-numberfield", new JSONObject(){{
                         put("minValue", 0);
                         put("decimalPrecision", 5);