Mercurial > repos > galaxyp > proteinpilot

changeset 7:ffbfff887a03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change params named "type" to something that won't confuse galaxy.
author Jim Johnson <jj@umn.edu>
date Mon, 20 Oct 2014 15:54:33 -0500
parents b3cf7d7dadc1
children 0aa9d080713e
files proteinpilot_tabular.xml
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/proteinpilot_tabular.xml	Tue Sep 30 10:45:56 2014 -0400
+++ b/proteinpilot_tabular.xml	Mon Oct 20 15:54:33 2014 -0500
@@ -3,22 +3,22 @@
   <!-- TOOD: Implement wrapper allowing Windows newlines to be replaced. -->
   <command>
     #if $quant.use
-    #set $denom = $quant.type
+    #set $denom = $quant.dtype
     #else
     #set $denom = ""
     #end if
-    group2xml.exe ${type} $input $output $denom
+    group2xml.exe ${ptype} $input $output $denom
   </command>
   <inputs>
     <param format="group" name="input" type="data" label="ProteinPilot Group Data" help=""/>
-    <param name="type" type="select" label="Summary Type">
+    <param name="ptype" type="select" label="Summary Type">
       <option value="PROTEIN">Protein</option>
       <option value="PEPTIDE">Peptide</option>
     </param>
     <conditional name="quant">
       <param name="use" type="boolean" label="Include quantation results" truevalue="true" falsevalue="false" />
       <when value="true">
-        <param name="type" type="select" label="Denominator">
+        <param name="dtype" type="select" label="Denominator">
           <option value="IT113">113</option>
           <option value="IT114" selected="true">114</option>
           <option value="IT115">115</option>
@@ -32,10 +32,11 @@
           <option value="Medium">Medium</option>
         </param>
       </when>
+      <when value="false"/>
     </conditional>
   </inputs>
   <outputs>
-    <data format="tabular" name="output" label="${type} report for ${on_string}"/>
+    <data format="tabular" name="output" label="${ptype} report for ${on_string}"/>
   </outputs>
   <help>
   </help>