[Swift-commit] r2832 - SwiftApps/pc3

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-04-05 08:58:08 -0500 (Sun, 05 Apr 2009)
New Revision: 2832

Modified:
   SwiftApps/pc3/CompactDatabase.sh
   SwiftApps/pc3/CountEntries.sh
   SwiftApps/pc3/ExtractEntry.sh
   SwiftApps/pc3/PSLoadExecutable.sh
   SwiftApps/pc3/PSLoadExecutableDB.sh
   SwiftApps/pc3/ParseXMLBooleanValue.sh
   SwiftApps/pc3/README
Log:
revert r2828 which was accidentally committed

Modified: SwiftApps/pc3/CompactDatabase.sh
===================================================================
--- SwiftApps/pc3/CompactDatabase.sh	2009-04-05 13:08:22 UTC (rev 2831)
+++ SwiftApps/pc3/CompactDatabase.sh	2009-04-05 13:58:08 UTC (rev 2832)
@@ -1,7 +1,7 @@
 #!/bin/bash
 INPUT=$1
 
-java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute CompactDatabase -f $INPUT
+$JAVA_HOME/bin/java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute CompactDatabase -f $INPUT
 
 
- 
+ 
\ No newline at end of file

Modified: SwiftApps/pc3/CountEntries.sh
===================================================================
--- SwiftApps/pc3/CountEntries.sh	2009-04-05 13:08:22 UTC (rev 2831)
+++ SwiftApps/pc3/CountEntries.sh	2009-04-05 13:58:08 UTC (rev 2832)
@@ -2,5 +2,4 @@
 INPUT=$1
 OUTPUT=$2
 
-# xpath -q -e "count(/java/object/void/object)" $INPUT > $OUTPUT
-xpath $INPUT "count(/java/object/void/object)" > $OUTPUT
+xpath -q -e "count(/java/object/void/object)" $INPUT > $OUTPUT

Modified: SwiftApps/pc3/ExtractEntry.sh
===================================================================
--- SwiftApps/pc3/ExtractEntry.sh	2009-04-05 13:08:22 UTC (rev 2831)
+++ SwiftApps/pc3/ExtractEntry.sh	2009-04-05 13:58:08 UTC (rev 2832)
@@ -5,7 +5,6 @@
 echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $OUTPUT 
 echo "<java version=\"1.6.0_12\" class=\"java.beans.XMLDecoder\">" >> $OUTPUT 
  
-# xpath -q -e "/java/object/void[$INTEGER]/object" $INPUT >> $OUTPUT
-xpath $INPUT "/java/object/void[$INTEGER]/object" >> $OUTPUT
+xpath -q -e "/java/object/void[$INTEGER]/object" $INPUT >> $OUTPUT
 
-echo "</java>" >> $OUTPUT
+echo "</java>" >> $OUTPUT
\ No newline at end of file

Modified: SwiftApps/pc3/PSLoadExecutable.sh
===================================================================
--- SwiftApps/pc3/PSLoadExecutable.sh	2009-04-05 13:08:22 UTC (rev 2831)
+++ SwiftApps/pc3/PSLoadExecutable.sh	2009-04-05 13:58:08 UTC (rev 2832)
@@ -3,5 +3,5 @@
 INPUT2=$2
 OUTPUT=$3
 
-java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $INPUT2 -o $OUTPUT -f $INPUT1
+$JAVA_HOME/bin/java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $INPUT2 -o $OUTPUT -f $INPUT1
 

Modified: SwiftApps/pc3/PSLoadExecutableDB.sh
===================================================================
--- SwiftApps/pc3/PSLoadExecutableDB.sh	2009-04-05 13:08:22 UTC (rev 2831)
+++ SwiftApps/pc3/PSLoadExecutableDB.sh	2009-04-05 13:58:08 UTC (rev 2832)
@@ -4,4 +4,4 @@
 SINPUT=$3
 OUTPUT=$4
 
-java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $SINPUT -o $OUTPUT -f $DB -f $INPUT 
+$JAVA_HOME/bin/java -Dderby.system.home=/var/tmp/derby-pc3/ -cp "$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadExecutable.jar:$PC3LIB/Java/bin/info.ipaw.pc3.PSLoadWorkflow.jar:$PC3LIB/Java/lib/derby.jar:$PC3LIB/Java/lib/derbyclient.jar:$PC3LIB/Java/lib/derbynet.jar:$PC3LIB/Java/lib/derbyrun.jar:$PC3LIB/Java/lib/derbytools.jar" info.ipaw.pc3.PSLoadExecutable.Execute $SINPUT -o $OUTPUT -f $DB -f $INPUT 

Modified: SwiftApps/pc3/ParseXMLBooleanValue.sh
===================================================================
--- SwiftApps/pc3/ParseXMLBooleanValue.sh	2009-04-05 13:08:22 UTC (rev 2831)
+++ SwiftApps/pc3/ParseXMLBooleanValue.sh	2009-04-05 13:58:08 UTC (rev 2832)
@@ -1,5 +1,4 @@
 #!/bin/bash
 INPUT=$1
 OUTPUT=$2
-# xpath -q -e '/java/boolean/text()' $INPUT > $OUTPUT
-xpath $INPUT '/java/boolean/text()' > $OUTPUT
+xpath -q -e '/java/boolean/text()' $INPUT > $OUTPUT

Modified: SwiftApps/pc3/README
===================================================================
--- SwiftApps/pc3/README	2009-04-05 13:08:22 UTC (rev 2831)
+++ SwiftApps/pc3/README	2009-04-05 13:58:08 UTC (rev 2832)
@@ -1,10 +1,10 @@
-* Download and extract PC3.tar.gz from the PC3 home page at
-  http://twiki.ipaw.info/bin/view/Challenge/ThirdProvenanceChallenge
+* This is a work-space for the Swift entry to the third provenance challenge
 
+* Download and extract PC3.tar.gz from the PC3 home page.
+
 * Append tc.data.append to your tc.data.
 
-* Requires xpath program (in Debian: $ apt-get install libxml-xpath-perl)
-* Requires Java 1.6
+* Requires xpath program (in Debian: $ apt-get install libxml-xpath-perl).
 
 * Example:
 
@@ -12,21 +12,8 @@
 $ cd PC3
 $ export JAVA_PATH=<path to Java>
 $ export PC3LIB=`pwd`
-$ cd Java/
-$ ant jar
-$ mkdir tmp
-$ cd tmp
+$ mkdir Java/tmp
+$ cd Java/tmp
 $ cp <path to pc3 wf impl>/pc3/* .
 $ export PATH=$PATH:`pwd`
 $ swift pc3.swift -csvpath=CSVRootPathInput.xml -jobid=JobIDInput.xml
-
-
-Extra notes for running on Ben's OS X 10.5 laptop with multiple Java versions
-installed, the default of which does not work:
-
-Set these:
-$ echo $JAVACMD 
-/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands//java
-$ echo $JAVA_HOME 
-/System/Library/Frameworks/JavaVM.framework/Versions/1.6/
-