[Swift-commit] r3729 - provenancedb

[noreply at svn.ci.uchicago.edu]

Author: lgadelha
Date: 2010-11-29 17:25:14 -0600 (Mon, 29 Nov 2010)
New Revision: 3729

Modified:
   provenancedb/import-run-to-sql
   provenancedb/prepare-provenance-chart
   provenancedb/prov-to-sql.sh
   provenancedb/swift-prov-import-all-logs
Log:
Make imports use both the new and the old provenance identifiers.


Modified: provenancedb/import-run-to-sql
===================================================================
--- provenancedb/import-run-to-sql	2010-11-28 21:55:43 UTC (rev 3728)
+++ provenancedb/import-run-to-sql	2010-11-29 23:25:14 UTC (rev 3729)
@@ -9,5 +9,5 @@
 # with kickstart records expected to be in the same directory as the
 # log file.
 
-prov-to-sql.sh $1
+PROVIDPREFIX=$PROVIDPREFIX prov-to-sql.sh $1
 

Modified: provenancedb/prepare-provenance-chart
===================================================================
--- provenancedb/prepare-provenance-chart	2010-11-28 21:55:43 UTC (rev 3728)
+++ provenancedb/prepare-provenance-chart	2010-11-29 23:25:14 UTC (rev 3729)
@@ -8,8 +8,8 @@
 
 export RUNID=$(basename $1 .log)
 
-export WFID="execute:${RUNID}:"
-export EXECUTE2PREFIX="execute2:${RUNID}:"
+export WFID=$PROVIDPREFIX"execute:${RUNID}:"
+export EXECUTE2PREFIX=$PROVIDPREFIX"execute2:${RUNID}:"
 
 # will output log information about datasets from a log file passed as $1
 

Modified: provenancedb/prov-to-sql.sh
===================================================================
--- provenancedb/prov-to-sql.sh	2010-11-28 21:55:43 UTC (rev 3728)
+++ provenancedb/prov-to-sql.sh	2010-11-29 23:25:14 UTC (rev 3729)
@@ -2,10 +2,10 @@
 
 export RUNID=$(basename $1 .log)
 
-export WFID="execute:${RUNID}:"
+export WFID=$PROVIDPREFIX"execute:${RUNID}:"
 
 # TODO is there already a URI form for identifying workflows?
-export WF="execute:${RUNID}:run"
+export WF=$PROVIDPREFIX"execute:${RUNID}:run"
 
 echo Generating SQL for $RUNID
 

Modified: provenancedb/swift-prov-import-all-logs
===================================================================
--- provenancedb/swift-prov-import-all-logs	2010-11-28 21:55:43 UTC (rev 3728)
+++ provenancedb/swift-prov-import-all-logs	2010-11-29 23:25:14 UTC (rev 3729)
@@ -48,21 +48,24 @@
     	    else
 		wfstatus="FAIL"
 	    fi
+	    
+	    export RUNID=$(basename $filename .log)
+	    if [ $version -le 3726 ]; then
+		PROVIDPREFIX="tag:ci.uchicago.edu,2008:swiftlogs:"
+	    fi
 
-	    export RUNID=$(basename $filename .log)
-	    export WF="execute:${RUNID}:run"
+	    export WF=$PROVIDPREFIX"execute:${RUNID}:run"
 	    
 	    echo "INSERT INTO workflow (id, log_filename, swift_version, import_status) VALUES ('$WF','$filename','$version','$wfstatus');" | $SQLCMD
-
 	    
 	    echo version $version in log file $filename
 	    echo ============= will import =============
-	    prepare-for-import $filename
+	    PROVIDPREFIX=$PROVIDPREFIX prepare-for-import $filename
 	    if [ "$?" != "0" ]; then
 		echo prepare-for-import failed
 		exit 2
 	    fi
-	    import-run-to-sql $filename
+	    PROVIDPREFIX=$PROVIDPREFIX import-run-to-sql $filename
 	    if [ "$?" != "0" ]; then
 		echo import-run-to-sql failed
 		exit 3