--- a/blast_report.xml	Thu Sep 12 00:56:20 2019 -0400
+++ b/blast_report.xml	Mon Mar 02 23:41:54 2020 +0000
@@ -1,54 +1,44 @@
-<tool id="blast_report" name="BLAST report" force_history_refresh="true" version="1.1.0">
-    <description>Report on BLAST results</description>
-    <command >
-        <![CDATA[  
-          '$__tool_directory__/blast_report.py'
-          '${in_tab}'
-          '${tmpl.fields.path}'
-          '${out_html}'
-          '${out_tab}'
-          -f '${filter_pident}:$filter_kws'
-          #if str($bins) == "None"
-            #pass
-          #else
-          -b "${bins.fields.path}"
-          #end if
-          #if $hsp_bool
-            -r
-          #end if
+<tool id="blast_report" name="BLAST report" version="0.1.0+galaxy0" >
+    <description>Produce an HTML table report of BLAST results</description>
+    <command detect_errors="error_code">
+        <![CDATA[
+          '${__tool_directory__}/blast_report.py' 
+            '${tabular_blast_report_input}'
+            '${report_template}'
+            '${out_html}'
+            '${out_tab}'
+            -f ${filter_pident}:$filter_kws
+            #if str($bins) != "None"
+              -b "${bins}"
+            #end if
+            $discard_redundant
         ]]>
     </command>
     <inputs>
-        <param name="in_tab" type="data" format="tabular" label="Tabular BLAST results (extended 26 columns)"/>
-        <param name="tmpl" type="select" optional="false" label="Report template">
+        <param name="tabular_blast_report_input" type="data" format="tabular" label="Tabular BLAST results (extended 26 columns)"/>
+        <param name="report_template" type="select" optional="false" label="Report template">
             <options from_data_table="blast_report_templates">
-                <column name="value" index="0"/>
-                <column name="name" index="1"/>
-		<column name="path" index="2"/>
+                <validator type="no_options" message="No BLAST report templates are available" />
             </options>
         </param>
         <param name="filter_pident" type="integer" min="90" max="100" value="97" label="Minimum percentage identity"/>
         <param name="filter_kws" type="text" size="50" label="Comma-separated list of description keyword filters" value="bovine,clone,environmental,swine,uncultivated,uncultured,unidentified"/>
         <param name="bins" type="select" label="Database bins" multiple="true" display="checkboxes">
-            <options from_data_table="blast_report_bins">
-                <column name="value" index="0"/>
-                <column name="name" index="1"/>
-		<column name="path" index="2"/>
+            <options from_data_table="blast_reference_bins">
+                <validator type="no_options" message="No BLAST reference bins available" />
             </options>
         </param>
-        <!--<repeat name="hist_bins" title="History database bins">
-            <param name="filter" type="data" format="csv" label="History database bin"/>
-        </repeat>-->
-        <param name="hsp_bool" type="boolean" label="Throw out redundant hits?"/> 
-        <param name="tab_bool" type="boolean" label="Output tabular file?"/>
+       	<param name="discard_redundant" type="boolean" truevalue="-r" falsevalue="" label="Throw out redundant hits?"/> 
+        <param name="output_tabular" type="boolean" label="Output tabular file?"/>
     </inputs>
     <outputs>
         <data name="out_html" format="html" label="$tool.name on data $in_tab.hid: report"/>
         <data name="out_tab" format="tabular" label="$tool.name on data $in_tab.hid: tabular results">
-            <filter> tab_bool </filter>
+            <filter> output_tabular </filter>
         </data>
     </outputs>
     <help>
+
 .. class:: infomark
 
 **What it does**