[Swift-commit] r2687 - provenancedb

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-03-16 08:16:17 -0500 (Mon, 16 Mar 2009)
New Revision: 2687

Modified:
   provenancedb/import-all
   provenancedb/prepare-for-import
   provenancedb/prepare-provenance-chart
Log:
Make import scripts use the main swift-plot-log  driver command, and stay away
from directly messing with log-processing libexec components.

Modified: provenancedb/import-all
===================================================================
--- provenancedb/import-all	2009-03-16 13:15:27 UTC (rev 2686)
+++ provenancedb/import-all	2009-03-16 13:16:17 UTC (rev 2687)
@@ -8,7 +8,7 @@
 source paths.source
 export PATH=$LOGDIR:$PROVDIR:$PATH
 
-create-everylog-vs-versions-data $LOGREPO
+swift-plot-log $LOGREPO everylog-vs-versions.data
 
 # TODO better tmp handling that always using the same name in a shared
 # directory

Modified: provenancedb/prepare-for-import
===================================================================
--- provenancedb/prepare-for-import	2009-03-16 13:15:27 UTC (rev 2686)
+++ provenancedb/prepare-for-import	2009-03-16 13:16:17 UTC (rev 2687)
@@ -4,9 +4,7 @@
 # workflow has finished and will do everything necessary to import all
 # of the provenance information into the SQL provenance database.
 
-pushd $LOGDIR
-make LOG=$1 clean execute.global.event execute2.event workflow.event
-popd
+swift-plot-log $1 execute.global.event execute2.event workflow.event
 
 prepare-provenance-chart $1
 

Modified: provenancedb/prepare-provenance-chart
===================================================================
--- provenancedb/prepare-provenance-chart	2009-03-16 13:15:27 UTC (rev 2686)
+++ provenancedb/prepare-provenance-chart	2009-03-16 13:16:17 UTC (rev 2687)
@@ -1,5 +1,4 @@
 #!/bin/bash
-pushd $LOGDIR
 
 # invent an ID. doesn't need to have any meaning. needs to be unique.
 # uuidgen for now.
@@ -23,5 +22,4 @@
 
 cat $1 | grep ' PROCEDURE ' | sed "s/^.*thread=\([^ ]*\) name=\([^ ]*\)\$/${WFID}\1 \2/" > invocation-procedure-names.txt
 
-popd