Index: /trunk/ippTasks/phase0.pro
===================================================================
--- /trunk/ippTasks/phase0.pro	(revision 11235)
+++ /trunk/ippTasks/phase0.pro	(revision 11236)
@@ -41,5 +41,5 @@
 
   # XXX test that this option works
-  npending     1
+#  npending     1
 
   # silently drop stdout
@@ -104,6 +104,6 @@
     book getword p0PendingImfile $pageName class_id -var CLASS_ID
     book getword p0PendingImfile $pageName uri -var URI
-    book getword p0PendingImfile $pageName outpath -var OUTPATH
-    book getword p0PendingImfile $pageName dbname -var DBNAME
+    book getword p0PendingImfile $pageName workdir -var WORKDIR
+#    book getword p0PendingImfile $pageName dbname -var DBNAME
 
     # specify choice of remote host
@@ -115,9 +115,9 @@
 
     ## generate output log based on filerule
-    $outroot = $OUTPATH/$EXP_TAG
+    $outroot = $WORKDIR/$EXP_TAG
     $logfile = `ipp_filename.pl PHASE0.LOG $outroot $CLASS_ID`
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $OUTPATH
+    exec mkdir -p $WORKDIR
 
     # save the pageName for future reference below
@@ -126,7 +126,7 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command phase0_imfile.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI --dbname $DBNAME
-    end
-    command phase0_imfile.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI --dbname $DBNAME
+      echo command phase0_imfile.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI
+    end
+    command phase0_imfile.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI
   end
 
@@ -199,5 +199,5 @@
     book setword p0PendingExp $pageName state RUN
     book getword p0PendingExp $pageName exp_tag -var EXP_TAG
-    book getword p0PendingExp $pageName outpath -var OUTPATH
+    book getword p0PendingExp $pageName workdir -var WORKDIR
 
     # specify choice of remote host:(need to choose based on chips)
@@ -209,9 +209,9 @@
 
     ## generate output log based on filerule
-    $outroot = $OUTPATH/$EXP_TAG
+    $outroot = $WORKDIR/$EXP_TAG
     $logfile = `ipp_filename.pl PHASE0.LOG $outroot FPA`
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $OUTPATH
+    exec mkdir -p $WORKDIR
 
     # save the pageName for future reference below
Index: /trunk/ippTasks/phase2.pro
===================================================================
--- /trunk/ippTasks/phase2.pro	(revision 11235)
+++ /trunk/ippTasks/phase2.pro	(revision 11236)
@@ -84,5 +84,5 @@
     book getword p2PendingImfile $pageName camera -var CAMERA
     book getword p2PendingImfile $pageName exp_tag -var EXP_TAG
-    book getword p2PendingImfile $pageName outpath -var OUTPATH
+    book getword p2PendingImfile $pageName workdir -var WORKDIR
     book getword p2PendingImfile $pageName class_id -var CLASS_ID
     book getword p2PendingImfile $pageName uri -var URI
@@ -97,9 +97,9 @@
 
     ## generate output log based on filerule
-    $outroot = $OUTPATH/$EXP_TAG
+    $outroot = $WORKDIR/$EXP_TAG
     $logfile = `ipp_filename.pl PHASE2.LOG $outroot $CLASS_ID`
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $OUTPATH
+    exec mkdir -p $WORKDIR
 
     # save the pageName for future reference below
@@ -110,5 +110,5 @@
       echo command phase2.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI --camera $CAMERA
     end
-    command phase2.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI --camera $CAMERA --outpath $OUTPATH
+    command phase2.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI --camera $CAMERA --workdir $WORKDIR
   end