--- a/unique.seqs.xml	Tue Sep 05 17:05:31 2017 -0400
+++ b/unique.seqs.xml	Tue Mar 20 21:58:25 2018 -0400
@@ -7,44 +7,52 @@
     <expand macro="stdio"/>
     <expand macro="version_command"/>
     <command><![CDATA[
-        @SHELL_OPTIONS@
+@SHELL_OPTIONS@
 
-        ## create symlinks to input datasets
-        ln -s "$names" names.dat &&
-        ln -s "$fasta" fasta.dat &&
+## create symlinks to input datasets
+ln -s '$names' names.dat &&
+ln -s '$fasta' fasta.dat &&
 
-        echo 'unique.seqs(
-            #if $names.is_of_type('mothur.names'):
-                name=names.dat,
-            #elif $names.is_of_type('mothur.count_table'):
-                count=names.dat,
-            #end if
-            fasta=fasta.dat
-        )'
-        | sed 's/ //g'  ## mothur trips over whitespace
-        | mothur
-        | tee mothur.out.log
+echo 'unique.seqs(
+    #if $names.is_of_type('mothur.names'):
+        name=names.dat,
+    #elif $names.is_of_type('mothur.count_table'):
+        count=names.dat,
+    #end if
+    fasta=fasta.dat,
+    format=$format
+)'
+| sed 's/ //g'  ## mothur trips over whitespace
+| mothur
+| tee mothur.out.log
     ]]></command>
     <inputs>
         <param name="fasta" type="data" format="fasta" label="fasta - Sequences to filter"/>
         <param name="names" type="data" format="mothur.names,mothur.count_table" optional="true" label="name file or count table - Sequences Names"/>
+        <param name="format" type="select" label="output format">
+            <option value="count" selected="true"> Count table </option>
+            <option value="name"> Name file </option>
+        </param>
+        <expand macro="param-savelog"/>
     </inputs>
     <outputs>
         <expand macro="logfile-output"/>
         <data name="out_fasta" format_source="fasta" from_work_dir="fasta*.unique.*" label="${tool.name} on ${on_string}: fasta"/>
         <data name="out_names" format="mothur.names" from_work_dir="fasta*.names" label="${tool.name} on ${on_string}: names">
-            <filter>names.ext != "mothur.count_table"</filter>
+            <filter> format == "name" </filter>
         </data>
         <data name="out_count" format="mothur.count_table" from_work_dir="fasta*.count_table" label="${tool.name} on ${on_string}: count_table">
-            <filter>names and names.ext == "mothur.count_table"</filter>
+            <filter> format == "count" </filter>
         </data>
     </outputs>
     <tests>
         <test><!-- test with names file -->
             <param name="fasta" value="amazon.fasta"/>
             <param name="names" value="amazon1.names" ftype="mothur.names"/>
+            <param name="format" value="name"/>
             <output name="out_fasta" file="amazon.unique.fasta" ftype="fasta"/>
             <output name="out_names" file="amazon.unique.names" ftype="mothur.names"/>
+            <param name="savelog" value="true"/>
             <expand macro="logfile-test"/>
         </test>
         <test><!-- test with count file -->
@@ -52,17 +60,19 @@
             <param name="names" value="amazon.count_table" ftype="mothur.count_table"/>
             <output name="out_fasta" file="amazon.unique.fasta" ftype="fasta"/>
             <output name="out_count" md5="2024cbb895f79346606ab196dd130639" ftype="mothur.count_table"/>
+            <param name="savelog" value="true"/>
             <expand macro="logfile-test"/>
         </test>
         <test><!-- test wth fasta only -->
             <param name="fasta" value="amazon.fasta"/>
+            <param name="format" value="name"/>
             <output name="out_fasta" file="amazon.unique.fasta" ftype="fasta"/>
             <output name="out_names" file="amazon.unique.names" ftype="mothur.names"/>
+            <param name="savelog" value="true"/>
             <expand macro="logfile-test"/>
         </test>
     </tests>
-    <help>
-<![CDATA[
+    <help><![CDATA[
 
 @MOTHUR_OVERVIEW@
 
@@ -73,7 +83,6 @@
 .. _name: https://www.mothur.org/wiki/Name_file
 .. _unique.seqs: https://www.mothur.org/wiki/Unique.seqs
 
-]]>
-    </help>
+    ]]></help>
     <expand macro="citations"/>
 </tool>