# HG changeset patch
# User mingchen0919
# Date 1522172040 14400
# Node ID 80a84509dec05d744361c08ddaec3afe41b08793
# Parent  7a3cc84232a26d4308bb94cb4b3061119e6875f1
planemo upload

diff -r 7a3cc84232a2 -r 80a84509dec0 elastic_r_package_wrappers_macros.xml
--- a/elastic_r_package_wrappers_macros.xml	Tue Mar 27 12:48:17 2018 -0400
+++ b/elastic_r_package_wrappers_macros.xml	Tue Mar 27 13:34:00 2018 -0400
@@ -21,18 +21,23 @@
 
     <!--input values: string, float and integer-->
     <xml name="function_arguments">
-        <repeat name="regular_argument_value" title="INPUT VALUE: string/float/integer" min="0" default="0">
+        <repeat name="regular_argument_value" title="INPUT VALUE: string/numeric/boolean" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="text" name="argument_value"  label="argument value"  />
+            <param type="select" name="argument_type"  label="argument type">
+                <option value="string" selected="true">string</option>
+                <option value="numeric" selected="true">numeric</option>
+                <option value="boolean" selected="true">boolean</option>
+            </param>
         </repeat>
-        <repeat name="rdata_argument_value" title="INPUT VALUE: RData output" min="0" default="0">
+        <repeat name="rdata_argument_value" title="INPUT VALUE: from RData" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="text" name="argument_value"  label="RData output"  />
         </repeat>
-        <repeat name="function_argument_value" title="INPUT VALUE: function" min="0" default="0">
+        <repeat name="function_argument_value" title="INPUT VALUE: from function output" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
-            <export macro="function_name" />
-            <export macro="nested_function_arguments" />
+            <expand macro="function_name" />
+            <expand macro="nested_function_arguments" />
         </repeat>
         <param type="select" name="connection" label="connection function">
             <option value="%>%" selected="false">pipe (%>%)</option>
@@ -41,11 +46,16 @@
     </xml>
 
     <xml name="nested_function_arguments">
-        <repeat name="regular_argument_value" title="INPUT VALUE: string/float/integer" min="0" default="0">
+        <repeat name="regular_argument_value" title="INPUT VALUE: string/numeric/boolean" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="text" name="argument_value"  label="argument value"  />
+            <param type="select" name="argument_type"  label="argument type">
+                <option value="string" selected="true">string</option>
+                <option value="numeric" selected="true">numeric</option>
+                <option value="boolean" selected="true">boolean</option>
+            </param>
         </repeat>
-        <repeat name="rdata_argument_value" title="INPUT VALUE: RData output" min="0" default="0">
+        <repeat name="rdata_argument_value" title="INPUT VALUE: from RData" min="0" default="0">
             <param type="text" name="argument" label="argument"  />
             <param type="text" name="argument_value"  label="RData output"  />
         </repeat>