[Swift-commit] r3733 - provenancedb

[noreply at svn.ci.uchicago.edu]

Author: lgadelha
Date: 2010-12-03 17:11:51 -0600 (Fri, 03 Dec 2010)
New Revision: 3733

Modified:
   provenancedb/prov-to-sql.sh
Log:
Minor fixes.


Modified: provenancedb/prov-to-sql.sh
===================================================================
--- provenancedb/prov-to-sql.sh	2010-12-02 03:37:14 UTC (rev 3732)
+++ provenancedb/prov-to-sql.sh	2010-12-03 23:11:51 UTC (rev 3733)
@@ -9,7 +9,7 @@
 
 echo Generating SQL for $RUNID
 
-rm -f tmp-u.sql tmp-ds.sql tmp-p.sql tmp-e.sql tmp-e2.sql tmp-dsu.sql tmp-dsc.sql tmp-f.sql tmp-v.sql tmp-import.sql import.sql 
+rm -f tmp-u.sql tmp-ds.sql tmp-p.sql tmp-e.sql tmp-e2.sql tmp-dsu.sql tmp-dsc.sql tmp-f.sql tmp-v.sql tmp-import.sql import.sql
 
 # this gives a distinction between the root process for a workflow and the
 # workflow itself. perhaps better to model the workflow as a process
@@ -90,13 +90,17 @@
 
 # TODO this could merge with other naming tables
 while read start duration thread final_state procname ; do
-    compoundid=$WFID$thread
-    echo "INSERT INTO process (id, type, name, workflow_id) VALUES ('$compoundid', 'compound', '$procname', '$WF');" >> tmp-p.sql
+    if [ "$duration" != "last-event-line" ]; then
+	compoundid=$WFID$thread
+	echo "INSERT INTO process (id, type, name, workflow_id) VALUES ('$compoundid', 'compound', '$procname', '$WF');" >> tmp-p.sql
+    fi
 done < compound.event
 
 while read start duration thread final_state procname ; do
-    fqid=$WFID$thread
-    echo "INSERT INTO process (id, type, name, workflow_id) VALUES ('$fqid', 'internal', '$procname', '$WF');" >> tmp-p.sql
+    if [ "$duration" != "last-event-line" ]; then
+	fqid=$WFID$thread
+	echo "INSERT INTO process (id, type, name, workflow_id) VALUES ('$fqid', 'internal', '$procname', '$WF');" >> tmp-p.sql
+    fi	
 done < internalproc.event
 
 while read t ; do 
@@ -132,7 +136,6 @@
 cat tmp-dsc.sql | sort | uniq >> import.sql
 cat tmp-import.sql | sort | uniq >> import.sql
 cat tmp-u.sql | sort | uniq >> import.sql
-
 echo Sending SQL to DB
 
 $SQLCMD < import.sql