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

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-02-06 22:28:40 -0600 (Thu, 06 Feb 2014)
New Revision: 7577

Modified:
   SwiftApps/swift-galaxy/swift/buildsite.sh
   SwiftApps/swift-galaxy/swift/swiftforeach.xml
   SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
   SwiftApps/swift-galaxy/swift/swiftforeachrange.sh
Log:
allow selection of multiple sites

Modified: SwiftApps/swift-galaxy/swift/buildsite.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/buildsite.sh	2014-02-07 03:52:25 UTC (rev 7576)
+++ SwiftApps/swift-galaxy/swift/buildsite.sh	2014-02-07 04:28:40 UTC (rev 7577)
@@ -7,11 +7,15 @@
 # uc3
 
 # defaults to localhost of none of the above provided
-
+echo $@ > /tmp/buildsiteargs.txt
 # numeric range
 site=$1
 wdir=$2
 # use "here" document for configs
+
+#pre='<?xml version="1.0" encoding="UTF-8"?>
+#<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">'
+
 case "$site" in
 midway )
 cat << EOF > $wdir/sites.xml

Modified: SwiftApps/swift-galaxy/swift/swiftforeach.xml
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-07 03:52:25 UTC (rev 7576)
+++ SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-07 04:28:40 UTC (rev 7577)
@@ -4,7 +4,8 @@
          1. Option if the counter should be an argument, first one or last one.
          2. Option to add files (in Galaxy dataset format) as arguments.
          3. Allow user to add more than one resource to run a job for load balancing.
-         4. Add ability to run Swift/T
+         4. Add ability to run Swift/T.
+         
     -->
     <description>A generic tool to run executable via Swift foreach parallel construct</description>
 
@@ -41,7 +42,7 @@
     </command>
 
     <inputs>
-        <param name="site" type="select" label="Execution Location">
+        <param name="site" type="select" multiple="true" label="Execution Location" help="Multi-select list - hold the appropriate key while clicking to select multiple items">
             <option value="localhost">Localhost</option>
             <option value="midway">Midway</option>
             <option value="uc3">UC3</option>

Modified: SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachlist.sh	2014-02-07 03:52:25 UTC (rev 7576)
+++ SwiftApps/swift-galaxy/swift/swiftforeachlist.sh	2014-02-07 04:28:40 UTC (rev 7577)
@@ -3,7 +3,7 @@
 wdir=$(mktemp -d /tmp/swift-gal.XXXX)
 
 # numeric range
-site=$1
+site=$1 # comma separated list of sites
 shift
 interpreter=$1
 shift

Modified: SwiftApps/swift-galaxy/swift/swiftforeachrange.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachrange.sh	2014-02-07 03:52:25 UTC (rev 7576)
+++ SwiftApps/swift-galaxy/swift/swiftforeachrange.sh	2014-02-07 04:28:40 UTC (rev 7577)
@@ -1,9 +1,10 @@
 #!/bin/bash
 
+echo $@ > /tmp/args.txt
 wdir=$(mktemp -d /tmp/swift-gal.XXXX)
 
 # numeric range
-site=$1
+site=$1 # comma separated list of sites
 shift
 interpreter=$1
 shift