[Swift-commit] r6164 - trunk/resources

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-01-23 18:31:35 -0600 (Wed, 23 Jan 2013)
New Revision: 6164

Modified:
   trunk/resources/Karajan.stg
Log:
fixed range provenance

Modified: trunk/resources/Karajan.stg
===================================================================
--- trunk/resources/Karajan.stg	2013-01-22 21:12:11 UTC (rev 6163)
+++ trunk/resources/Karajan.stg	2013-01-24 00:31:35 UTC (rev 6164)
@@ -422,18 +422,21 @@
 
 range(from, to, step, datatype) ::= <<
 	<sequential>
-		<vdl:range>
-			<argument name="from">$from$</argument>
-			<argument name="to">$to$</argument>
+		<set name="swift#rangeout">
+			<vdl:range>
+				<argument name="from">$from$</argument>
+				<argument name="to">$to$</argument>
 $if(step)$
-			<argument name="step">$step$</argument>
+				<argument name="step">$step$</argument>
 $endif$
-		</vdl:range>
-		$range_log()$
+			</vdl:range>
+		</set>
+		$range_log(from=from, to=to, step=step)$
+		<variable>swift#rangeout</variable>
 	</sequential> 
 >>
 
-range_log() ::= <<
+range_log(from, to, step) ::= <<
 	<if>
 		<equals><vdl:configProperty><string>provenance.log</string></vdl:configProperty><string>true</string></equals>
  		<then>
@@ -441,10 +444,10 @@
  				<concat>
     				<string>ARRAYRANGE thread={#thread} array=</string>
     				<vdl:getdatasetprovenanceid var="{swift#rangeout}" />
-    				<string> from=</string> <vdl:getdatasetprovenanceid var="{swift#from}" />
-    				<string> to=</string> <vdl:getdatasetprovenanceid var="{swift#to}" />
+    				<string> from=</string> <vdl:getdatasetprovenanceid>$from$</vdl:getdatasetprovenanceid>
+    				<string> to=</string> <vdl:getdatasetprovenanceid>$to$</vdl:getdatasetprovenanceid>
     				$if(step)$
-    					<string> step=</string> <vdl:getdatasetprovenanceid var="{swift#step}" />
+    					<string> step=</string> <vdl:getdatasetprovenanceid>$step$</vdl:getdatasetprovenanceid>
     				$else$
     					<string> step=none</string>
     				$endif$