[Swift-commit] r7560 - SwiftApps/swift-galaxy/swift

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-02-04 10:58:40 -0600 (Tue, 04 Feb 2014)
New Revision: 7560

Modified:
   SwiftApps/swift-galaxy/swift/swiftforeach.xml
Log:
Cheetah code fix

Modified: SwiftApps/swift-galaxy/swift/swiftforeach.xml
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-04 04:39:41 UTC (rev 7559)
+++ SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-04 16:58:40 UTC (rev 7560)
@@ -2,33 +2,35 @@
     <description>A generic tool to run executable via Swift foreach parallel construct</description>
 
     <command interpreter="bash">
-      #if $rangeorlist.kind == "range" 
-      swiftforeachrange.sh
-      $site 
-      $interpreter
-      $executable
-      $rstart
-      $rend
-      $stepsize
-      $outloc
-      $logfile
-      $outlist
-      #for $a in $arg
-      ${a.argname}
-      #end for
-      #else
-      swiftforeachlist.sh
-      $site 
-      $interpreter
-      $executable
-      $listfile
-      $outloc
-      $logfile
-      $outlist
-      #for $a in $arg
-      ${a.argname}
-      #end for
-      #end if
+        
+    #if $rangeorlist.rl == "rng" 
+    swiftforeachrange.sh
+    $site 
+    $interpret
+    $exec
+    $rangeorlist.rngstart
+    $rangeorlist.rend
+    $rangeorlist.stepsize
+    $outloc
+    $logfile
+    $outlist
+    #for $a in $arg
+    ${a.argname}
+    #end for
+    #else
+    swiftforeachlist.sh
+    $site 
+    $interpret
+    $exec
+    $rangeorlist.listfile
+    $outloc
+    $logfile
+    $outlist
+    #for $a in $arg
+    ${a.argname}
+    #end for
+    #end if
+
     </command>
 
     <inputs>
@@ -39,7 +41,7 @@
             <option value="stampede">Stampede</option>
         </param>
 
-        <param name="interpreter" type="select" label="Execution interpreter">
+        <param name="interpret" type="select" label="Execution interpreter">
             <option value="sh">sh</option>
             <option value="python">python</option>
             <option value="java">java</option>
@@ -47,23 +49,24 @@
             <option value="matlab">matlab</option>
         </param>
 
-        <param format="sh,binexec" name="executable" type="data" label="Executable"/>
+        <param format="sh,binexec" name="exec" type="data" label="Executable"/>
 
         <conditional name="rangeorlist">
-            <param name="kind" type="select" label="Select range or list">
-                <option value="range">numeric range</option>
-                <option value="list">items list</option>
-            </param>
+        <param name="rl" type="select" label="Select range or list">
+        <option value="rng">numeric range</option>
+        <option value="lst">items list</option>
+        </param>
 
-            <when value="range">
-                <param name="rstart" size="2" type="integer"  value="0" label="start"/>
-                <param name="rend" size="2" type="integer"  value="9" label="end"/>
-                <param name="stepsize" size="2" type="integer"  value="1" label="stepsize"/>
-            </when>
+        <when value="rng">
+        <param name="rngstart" size="2" type="integer"  value="0" label="start"/>
+        <param name="rend" size="2" type="integer"  value="9" label="end"/>
+        <param name="stepsize" size="2" type="integer"  value="1" label="stepsize"/>
+        </when>
 
-            <when value="list">
-                <param format="data" name="listfile" type="data" label="List file"/>
-            </when>
+        <when value="lst">
+        <param format="data" name="listfile" type="data" label="List file"/>
+        </when>
+
         </conditional>
         
         <repeat name="arg" title="arg">