Fix output filters

galaxyproject · Apr 17, 2024 · 1c52875 · 1c52875
1 parent 526bac7
commit 1c52875
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tools/cutadapt/cutadapt.xml b/tools/cutadapt/cutadapt.xml
@@ -385,15 +385,18 @@ $read_mod_options.zero_cap
     </inputs>
     <outputs>
         <data name="out1" format="fastqsanger" metadata_source="library|input_1" default_identifier_source="library|input_1" from_work_dir="out1.*" label="${tool.name} on ${on_string}: Read 1 Output">
-            <filter>library['type'] != 'paired_collection' and 'multiple_output' not in output_selector</filter>
+            <filter>library['type'] != 'paired_collection'</filter>
+            <filter>not output_selector or 'multiple_output' not in output_selector</filter>
             <expand macro="inherit_format_1" />
         </data>
         <data name="out2" format="fastqsanger" metadata_source="library|input_2" default_identifier_source="library|input_2" from_work_dir="out2.*" label="${tool.name} on ${on_string}: Read 2 Output" >
-            <filter>library['type'] == 'paired' and 'multiple_output' not in output_selector</filter>
+            <filter>library['type'] == 'paired'</filter>
+            <filter>not output_selector or 'multiple_output' not in output_selector</filter>
             <expand macro="inherit_format_2" />
         </data>
         <collection name="out_pairs" type="paired" format_source="library|input_1" label="${tool.name} on ${on_string}: Reads">
-            <filter>library['type'] == 'paired_collection' and 'multiple_output' not in output_selector</filter>
+            <filter>library['type'] == 'paired_collection'</filter>
+            <filter>not output_selector or 'multiple_output' not in output_selector</filter>
             <data name="forward" from_work_dir="out1.*" />
             <data name="reverse" from_work_dir="out2.*" />
         </collection>