[Swift-commit] r7041 - trunk/resources

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-09-08 01:11:52 -0500 (Sun, 08 Sep 2013)
New Revision: 7041

Modified:
   trunk/resources/Karajan.stg
Log:
fixed some of the provenance problems

Modified: trunk/resources/Karajan.stg
===================================================================
--- trunk/resources/Karajan.stg	2013-09-07 16:25:38 UTC (rev 7040)
+++ trunk/resources/Karajan.stg	2013-09-08 06:11:52 UTC (rev 7041)
@@ -369,14 +369,14 @@
 sequential(
 	tmp := swift:range($from$, $to$$if(step)$, step = $step$$endif$)
 	tmp
-	$range_log(from=from, to=to, step=step, out=tmp)$
-) 
+	$range_log(from=from, to=to, step=step, out="tmp")$
+)
 >>
 
 range_log(from, to, step, out) ::= <<
-	swift:log(INFO, str:concat("ARRAYRANGE thread=", currentThread(), " array=", getDatasetProvenanceId($out$),
-		" from=", getDatasetProvenanceId($from$), "to=", getDatasetProvenanceId($to$)
-		$if(step)$", step=", getDatasetProvenanceId($step$)$else$, "step=none"$endif$))
+	swift:log(LOG:INFO, k:concat("ARRAYRANGE thread=", currentThread(), " array=", getDatasetProvenanceID($out$),
+		" from=", getDatasetProvenanceID($from$), "to=", getDatasetProvenanceID($to$),
+		$if(step)$"step=", getDatasetProvenanceID($step$)$else$"step=none"$endif$))
 >>
 
 if(condition,vthen,velse,line,trace) ::= <<
@@ -505,7 +505,7 @@
 >>
 
 logSliceArray(memberchild, array, slice) ::= <<
-	swift:log(DEBUG, str:concat("SLICEARRAY thread=", currentThread(), " slice=", swift:getDatasetProvenanceID($slice$),
+	swift:log(LOG:DEBUG, k:concat("SLICEARRAY thread=", currentThread(), " slice=", swift:getDatasetProvenanceID($slice$),
 		" member=$member$ array=", swift:getDatasetProvenanceID($array$))
 >>