diff Marea/marea.xml @ 58:959a9cb7816a draft

Uploaded
author bimib
date Sun, 15 Mar 2020 11:37:31 -0400
parents dcb817af5d81
children d4bc7c7882c3
line wrap: on
line diff
--- a/Marea/marea.xml	Sun Mar 15 11:29:01 2020 -0400
+++ b/Marea/marea.xml	Sun Mar 15 11:37:31 2020 -0400
@@ -1,4 +1,4 @@
-<tool id="MaREA" name="Metabolic Reaction Enrichment Analysis" version="1.1.0">
+<tool id="MaREA" name="Metabolic Reaction Enrichment Analysis" version="1.1.1">
 	<macros>
 		<import>marea_macros.xml</import>
 	</macros>
@@ -28,7 +28,7 @@
                 ${data.input_name}
             #end for
             --comparison ${cond.comparis.comparison}
-            #if $cond.advanced.cond_map == 'true':
+            #if ${cond.advanced.cond_map.cond_map_choice} == 'true':
             	--custom_rules true
             	--custom_map ${cond.advanced.cond_map.custom_map}
             #end if
@@ -51,7 +51,7 @@
             #if $cond.comparis.comparison == 'onevsmany'
             	--control ${cond.comparis.controlgroup}
             #end if
-            #if $cond.advanced.cond_map == 'true':
+            #if $cond.advanced.cond_map.cond_map_choice == 'true':
             	--custom_rules true
             	--custom_map ${cond.advanced.cond_map.custom_map}
             #end if
@@ -98,7 +98,7 @@
 					<when value="false"></when>
 					<when value="true">
 						<conditional name="cond_map">
-						<param name="choice" type="boolean" checked="false" label="Use custom map?" help="Use this option only if you have generated RAS using a custom set of rules">
+						<param name="cond_map_choice" type="boolean" checked="false" label="Use custom map?" help="Use this option only if you have generated RAS using a custom set of rules">
 							<option value="false" selected="true">No</option>
 							<option value="true">Yes</option>
 						</param>
@@ -134,7 +134,7 @@
 				<when value="false"></when>
 				<when value="true">
 					<conditional name="cond_map">
-						<param name="choice" type="boolean" checked="false" label="Use custom map?" help="Use this option only if you have generated RAS using a custom set of rules">
+						<param name="cond_map_choice" type="boolean" checked="false" label="Use custom map?" help="Use this option only if you have generated RAS using a custom set of rules">
 							<option value="false" selected="true">No</option>
 							<option value="true">Yes</option>
 						</param>