--- a/umi-tools_extract.xml	Sun Feb 25 13:08:17 2018 -0500
+++ b/umi-tools_extract.xml	Mon Apr 16 16:38:40 2018 -0400
@@ -1,24 +1,13 @@
-<tool id="umi_tools_extract" name="UMI-tools extract" version="@VERSION@.0">
+<tool id="umi_tools_extract" name="UMI-tools extract" version="@VERSION@.1">
     <description>Extract UMI from fastq files</description>
     <macros>
         <import>macros.xml</import>
     </macros>
     <expand macro="requirements" />
     <command detect_errors="exit_code"><![CDATA[
-        #set $gz = False
-        #if $input_type.type == 'single':
-            #if $input_type.input_single.is_of_type("fastq.gz", "fastqsanger.gz"):
-                ln -s '$input_type.input_single' input_single.gz &&
-                #set $gz = True
-            #end if
-        #else
-            #if $input_type.input_read1.is_of_type("fastq.gz", "fastqsanger.gz"):
-                ln -s '$input_type.input_read1' input_read1.gz &&
-                ln -s '$input_type.input_read2' input_read2.gz &&
-                #set $gz = True
-            #end if
-        #end if
-        umi_tools extract
+    @COMMAND_LINK@
+
+    umi_tools extract
             --bc-pattern='$bc_pattern'
             #if $input_type.type == 'single':
                 #if $gz:
@@ -40,7 +29,7 @@
                     --stdout '$out1'
                     --read2-out='$out2'
                 #end if
-                #if $input_type.barcode.split == "1":
+                #if $input_type.barcode.barcode_select == "both_reads":
                     --split-barcode
                     --bc-pattern2='$input_type.barcode.bc_pattern2'
                 #end if
@@ -67,33 +56,7 @@
         #end if
     ]]></command>
     <inputs>
-        <conditional name="input_type">
-            <param name="type" type="select" label="Library type">
-                <option value="single">Single-end</option>
-                <option value="paired">Paired-end</option>
-            </param>
-            <when value="single">
-                <param name="input_single" type="data" format="fastq,fastq.gz" label="Reads in FASTQ format" />
-            </when>
-            <when value="paired">
-                <param name="input_read1" type="data" format="fastq,fastq.gz" label="Reads in FASTQ format" />
-                <param name="input_read2" type="data" format="fastq,fastq.gz" label="Reads in FASTQ format" />
-                <conditional name="barcode">
-                    <param name="split" argument="--split-barcode" type="select" label="Barcode on both reads?">
-                        <option value="0">Barcode on first read only</option>
-                        <option value="1">Barcode on both reads</option>
-                    </param>
-                    <when value="0">
-                    </when>
-                    <when value="1">
-                        <param name="bc_pattern2" argument="--bc-pattern2" type="text" value="" label="Barcode pattern for second read"
-                            help="Use this option to specify the format of the UMI/barcode for
-                                  the second read pair if required.">
-                        </param>
-                    </when>
-                </conditional>
-            </when>
-        </conditional>
+        <expand macro="input_types" />
         <param name="bc_pattern" argument="--bc-pattern" type="text" label="Barcode pattern for first read"
             help="Use this option to specify the format of the UMI/barcode. Use Ns to
                     represent the random positions and Xs to indicate the bc positions.
@@ -132,10 +95,10 @@
             <filter>input_type['type'] == "single"</filter>
         </data>
         <data name="out1" format_source="input_read1">
-            <filter>input_type['type'] == "paired"</filter>
+            <filter>input_type['type'] !== "single"</filter>
         </data>
         <data name="out2" format_source="input_read2">
-            <filter>input_type['type'] == "paired"</filter>
+            <filter>input_type['type'] !== "single"</filter>
         </data>
         <data name="out_log" format="txt">
             <filter>print_log == True</filter>
@@ -162,6 +125,19 @@
             <output name="out2" file="out_R2.fastq.gz" decompress="true" lines_diff="2" />
             <output name="out_log" file="out_paired.log" lines_diff="16"/>
         </test>
+        <test>
+            <param name="type" value="paired_collection" />
+            <param name="input_readpair" >
+                <collection type="paired">
+                    <element name="forward" ftype="fastq.gz" value="t_R1.fastq.gz" />
+                    <element name="reverse" ftype="fastq.gz" value="t_R2.fastq.gz" />
+                </collection>
+            </param>
+            <param name="bc_pattern" value="NNNXXX" />
+            <output name="out1" file="out_R1.fastq.gz" decompress="true" lines_diff="2" />
+            <output name="out2" file="out_R2.fastq.gz" decompress="true" lines_diff="2" />
+            <output name="out_log" file="out_paired.log" lines_diff="16"/>
+        </test>
     </tests>
     <help><![CDATA[