From f27c5901901a604be29dc1e4cf0937a70e715224 Mon Sep 17 00:00:00 2001
From: Greg Von Kuster <greg@bx.psu.edu>
Date: Tue, 18 Sep 2007 20:31:09 +0000
Subject: [PATCH] Enhanced grouping tool to use columnlist tool parameter.

---
 tools/stats/grouping.xml     | 31 +++++++++++++------------------
 tools/stats/grouping_code.py |  8 --------
 2 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 tools/stats/grouping_code.py

diff --git a/tools/stats/grouping.xml b/tools/stats/grouping.xml
index 5c7a1fb5427..05cfa3b874c 100644
--- a/tools/stats/grouping.xml
+++ b/tools/stats/grouping.xml
@@ -11,22 +11,18 @@
       #end for
   </command>
   <inputs>
-    <page>
-      <param format="tabular" name="input1" type="data" label="Select data" help="Query missing? See TIP below."/>
-  	</page>
-  	<page>
-      <param name="groupcol" label="Group by column" type="select" dynamic_options="get_columns( input1 )" />
-  	  <repeat name="operations" title="Operation">
-  		<param name="optype" type="select" label="Type">
-          <option value="mean">Mean</option>
-          <option value="max">Maximum</option>
-          <option value="min">Minimum</option>
-          <option value="sum">Sum</option>
-          <option value="c">Concatenate</option>
-        </param>
-        <param name="opcol" label="On column" type="select" dynamic_options="get_columns( input1 )" />
-  	  </repeat>
-  	</page>
+    <param format="tabular" name="input1" type="data" label="Select data" refresh_on_change="True" help="Query missing? See TIP below."/>
+    <param name="groupcol" label="Group by column" type="columnlist" assoc_dataset="input1" />
+    <repeat name="operations" title="Operation">
+      <param name="optype" type="select" label="Type">
+        <option value="mean">Mean</option>
+        <option value="max">Maximum</option>
+        <option value="min">Minimum</option>
+        <option value="sum">Sum</option>
+        <option value="c">Concatenate</option>
+      </param>
+      <param name="opcol" label="On numerical column" type="columnlist" assoc_dataset="input1" />
+  	</repeat>
   </inputs>
   <outputs>
     <data format="input" name="out_file1" metadata_source="input1" />
@@ -82,6 +78,5 @@ This tool allows you to group the input dataset by a particular column and perfo
 
    chr10	1700.00	['NM_11', 'NM_10']
    chr22	1533.33	['NM_17', 'NM_19', 'NM_18']
-</help>
-  <code file="grouping_code.py" />
+  </help>
 </tool>
diff --git a/tools/stats/grouping_code.py b/tools/stats/grouping_code.py
deleted file mode 100644
index 1d611888093..00000000000
--- a/tools/stats/grouping_code.py
+++ /dev/null
@@ -1,8 +0,0 @@
-
-def get_columns( input1 ):
-    columns = []
-
-    for col in range(1, input1.metadata.columns+1):
-        option = "c" + str(col)
-        columns.append((option,str(col),False))
-    return columns