--- a/column_remove_by_header.xml	Wed Apr 12 17:17:29 2017 -0400
+++ b/column_remove_by_header.xml	Sat Jul 16 06:55:49 2022 +0000
@@ -1,13 +1,13 @@
-<tool id="column_remove_by_header" name="Remove columns" version="0.0.1">
+<tool id="column_remove_by_header" name="Remove columns" version="1.0">
     <description>
         by heading
     </description>
     <requirements>
-        <requirement type="package" version="3.6.1">python</requirement>
-        <requirement type="package" version="4.1.3">gawk</requirement>
+        <requirement type="package" version="3.10.4">python</requirement>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
-        python '$__tool_directory__/column_remove_by_header.py' '${input_tabular}' '${output_tabular}' '${input_tabular.unsanitized.metadata.delimiter}' '${keep_columns}' '${strip_characters}'
+        python '$__tool_directory__/column_remove_by_header.py' -i '${input_tabular}' -o '${output_tabular}' -d '${input_tabular.unsanitized.metadata.delimiter}' ${keep_columns} -s '${strip_characters}' --unicode-escaped-cols
+        --columns
         #for $header in $headers:
             '${header.name}'
         #end for
@@ -15,26 +15,26 @@
     </command>
     <inputs>
         <param name="input_tabular" type="data" format="tabular" multiple="False" optional="False" label="Tabular file"/>
-        <repeat name="headers" title="Header" min="1" default="1">
+        <repeat name="headers" title="Select Columns" min="1" default="1">
             <param name="name" type="text" optional="False" label="Header name">
                 <sanitizer>
                     <valid initial="string.printable">
                         <remove value="&apos;"/>
                     </valid>
                     <mapping initial="none">
-                        <add source="&apos;" target=""/>
+                        <add source="&apos;" target="&apos;&quot;&apos;&quot;&apos;"/>
                     </mapping>
                 </sanitizer>
             </param>
         </repeat>
-        <param label="Keep named columns" name="keep_columns" type="boolean" truevalue="--keep" falsevalue="" checked="False"/>
+        <param name="keep_columns" type="boolean" truevalue="--keep" falsevalue="" checked="False" label="Keep named columns" help="When enabled revert the tool's action and drop all columns that are NOT selected above." />
         <param name="strip_characters" type="text" optional="False" label="Characters to strip when doing name comparison in first column" value="#" help="Removes characters from the left of the first column only.">
             <sanitizer>
                 <valid initial="string.printable">
                     <remove value="&apos;"/>
                 </valid>
                 <mapping initial="none">
-                    <add source="&apos;" target=""/>
+                    <add source="&apos;" target="&apos;&quot;&apos;&quot;&apos;"/>
                 </mapping>
             </sanitizer>
         </param>
@@ -46,7 +46,8 @@
         <test>
             <param name="input_tabular" value="in_1.tabular" ftype="tabular"/>
             <param name="name" value="a"/>
-            <param name="keep_columns" value=""/>
+            <param name="name" value="\xf6"/>
+            <param name="keep_columns" value="false"/>
             <param name="strip_characters" value="#"/>
             <output name="output_tabular" file="out_1.tabular" ftype="tabular"/>
         </test>
@@ -54,16 +55,18 @@
             <param name="input_tabular" value="in_1.tabular" ftype="tabular"/>
             <param name="name" value="a"/>
             <param name="name" value="KEY"/>
-            <param name="keep_columns" value="--keep"/>
+            <param name="keep_columns" value="true"/>
             <param name="strip_characters" value="#"/>
             <output name="output_tabular" file="out_2.tabular" ftype="tabular"/>
         </test>
     </tests>
-    <help>
-        <![CDATA[
-        Removes or keeps columns based upon user provided values.
-        ]]>
-    </help>
+    <help><![CDATA[
+Removes or keeps columns based upon user provided values.
+
+Hint: If any of the column names you would like to specify contains special
+(non-ASCII) characters, you can specify these using their Unicode escape
+sequences.
+    ]]></help>
     <citations>
     </citations>
-</tool>
\ No newline at end of file
+</tool>