--- a/datamash-ops.xml	Fri Sep 07 10:58:27 2018 -0400
+++ b/datamash-ops.xml	Sun Apr 10 11:41:19 2022 +0000
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<tool id="datamash_ops" name="Datamash" version="@WRAPPER_VERSION@">
+<tool id="datamash_ops" name="Datamash" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
     <description>(operations on tabular data)</description>
     <macros>
         <import>macros.xml</import>
@@ -14,8 +13,9 @@
                 $need_sort
                 $print_full_line
                 $ignore_case
-                #if str($grouping).strip()
-                --group '$grouping'
+                @FIELD_SEPARATOR@
+                #if str($grouping) != ''
+                    --group '$grouping'
                 #end if
                 #for $oper in $operations
                     ${oper.op_name}
@@ -25,15 +25,23 @@
           ]]>
     </command>
     <expand macro="inputs_outputs">
-        <param help="Example: to group by the first and fourth fields, use 1,4." label="Group by fields" name="grouping" type="text">
-            <validator message="Invalid value in field. Allowed values are 0-9, space, comma." type="regex">^[0-9, ]*$</validator>
+        <param argument="--group" name="grouping" type="text" label="Group by fields" help="Group consecutive rows with equal values in the chosen fields. If no columns are specified, each operation is performed in the entire input file. Comma separated list of column indices, e.g. 1,5">
+            <sanitizer invalid_char="">
+                <valid initial="string.digits">
+                    <add value="," />
+                </valid>
+                <mapping initial="none">
+                    <add source=" " target=""/>
+                </mapping>
+            </sanitizer>
+            <validator message="Invalid value in field. Allowed is a comma separated list of integer values or the empty string" type="regex">(^$)|(^\s*\d+\s*(,\s*\d+\s*)*$)</validator>
         </param>
-        <param falsevalue="" help="--header-in" label="Input file has a header line" name="header_in" truevalue="--header-in" type="boolean" />
-        <param falsevalue="" help="--header-out" label="Print header line" name="header_out" truevalue="--header-out" type="boolean" />
-        <param falsevalue="" help="--sort" label="Sort input" name="need_sort" truevalue="--sort" type="boolean" />
-        <param falsevalue="" help="--full" label="Print all fields from input file" name="print_full_line" truevalue="--full" type="boolean" />
-        <param falsevalue="" help="--ignore-case" label="Ignore case when grouping" name="ignore_case" truevalue="--ignore-case" type="boolean" />
-        <repeat default="1" min="1" name="operations" title="Operation to perform on each group">
+        <param argument="--sort" name="need_sort" type="boolean" truevalue="--sort" falsevalue="" label="Sort input" help="Input file must be sorted by the grouping columns. Enable this option to automatically sort the input."/>
+        <param argument="--header-in" type="boolean" truevalue="--header-in" falsevalue="" label="Input file has a header line" />
+        <param argument="--header-out" type="boolean" truevalue="--header-out" falsevalue="" label="Print header line" />
+        <param argument="--full" name="print_full_line" type="boolean" truevalue="--full" falsevalue="" label="Print all fields from input file" />
+        <param argument="--ignore-case" type="boolean" truevalue="--ignore-case" falsevalue="" label="Ignore case when grouping" />
+        <repeat name="operations" default="1" min="1" title="Operation to perform on each group">
             <param name="op_name" type="select" label="Type">
                 <option value="count">count</option>
                 <option value="sum">sum</option>
@@ -82,6 +90,39 @@
             </repeat>
             <output file="group_compute_output.txt" name="out_file" ftype="tabular" />
         </test>
+        <test>
+            <param name="in_file" value="group_compute_input.txt" ftype="tsv" />
+            <param name="grouping" value="2" />
+            <param name="header_in" value="true" />
+            <param name="header_out" value="true" />
+            <param name="need_sort" value="true" />
+            <param name="print_full_line" value="false" />
+            <param name="ignore_case" value="false" />
+            <repeat name="operations">
+                <param name="op_name" value="sum" />
+                <param name="op_column" value="3" />
+            </repeat>
+            <output file="group_compute_output.txt" name="out_file" ftype="tsv" />
+        </test>
+        <test>
+            <param name="in_file" value="group_compute_input.csv" ftype="csv" />
+            <param name="grouping" value="2" />
+            <param name="header_in" value="true" />
+            <param name="header_out" value="true" />
+            <param name="need_sort" value="true" />
+            <param name="print_full_line" value="false" />
+            <param name="ignore_case" value="false" />
+            <repeat name="operations">
+                <param name="op_name" value="sum" />
+                <param name="op_column" value="3" />
+            </repeat>
+            <output name="out_file" ftype="csv">
+                <assert_contents>
+                    <has_n_lines n="7"/>
+                    <has_line line="Arts,1310"/>
+                </assert_contents>
+            </output>
+        </test>
     </tests>
     <help>
 <![CDATA[
@@ -99,14 +140,14 @@
 
     Name        Major            Score
     Bryan       Arts             68
+    Gabriel     Health-Medicine  100
     Isaiah      Arts             80
-    Gabriel     Health-Medicine  100
     Tysza       Business         92
     Zackery     Engineering      54
     ...
     ...
 
-- Grouping the input by the second column (*Major*), and performing operations **mean** and **sample standard deviation** on the third column (*Score*), gives::
+- Grouping the input by the second column (*Major*), sorting the input, and performing operations **mean** and **sample standard deviation** on the third column (*Score*), gives::
 
     GroupBy(Major)     mean(Score)   sstdev(Score)
     Arts               68.9474       10.4215
@@ -116,6 +157,8 @@
     Life-Sciences      55.3333       20.606
     Social-Sciences    60.2667       17.2273
 
+Note that input needs sorting here, since the column used for grouping (*Major*) is not sorted.
+
 This sample file is available at http://www.gnu.org/software/datamash .
 
 **Example 2**