Index: trunk/ippTasks/warp.pro
===================================================================
--- trunk/ippTasks/warp.pro	(revision 18048)
+++ trunk/ippTasks/warp.pro	(revision 18057)
@@ -134,5 +134,6 @@
     book getword warpInputExp $pageName workdir -var WORKDIR_TEMPLATE
     book getword warpInputExp $pageName dbname -var DBNAME
-    book getword warpInputExp $pageName tess_id -var TESS_ID
+    # XXX change tess_id to tess_dir when schema is changed
+    book getword warpInputExp $pageName tess_id -var TESS_DIR
     book getword warpInputExp $pageName exp_id -var EXP_ID
 
@@ -151,5 +152,5 @@
     mkdir $outpath
 
-    $run = warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --tess_id $TESS_ID
+    $run = warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --tess_dir $TESS_DIR
     add_standard_args run
 
@@ -206,4 +207,5 @@
   task.exit    0
     # convert 'stdout' to book format
+    # XXX change tess_id to tess_dir when db is updated
     ipptool2book stdout warpPendingSkyCell -key warp_id:skycell_id:tess_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
@@ -245,5 +247,6 @@
     book getword warpPendingSkyCell $pageName warp_id -var WARP_ID
     book getword warpPendingSkyCell $pageName skycell_id -var SKYCELL_ID
-    book getword warpPendingSkyCell $pageName tess_id -var TESS_ID
+    # XXX change tess_id to tess_dir when schema is changed
+    book getword warpPendingSkyCell $pageName tess_id -var TESS_DIR
     book getword warpPendingSkyCell $pageName camera -var CAMERA
     book getword warpPendingSkyCell $pageName workdir -var WORKDIR_TEMPLATE
@@ -254,5 +257,7 @@
     set.workdir.by.camera $CAMERA $WARP_ID $WORKDIR_TEMPLATE $default_host WORKDIR
 
-    sprintf outroot "%s/tess_%s/%s/%s.%s.wrp.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $WARP_ID
+    # XXX we are supplied TESS_DIR, strip off path to generate TESS_ID
+    basename $TESS_DIR -var TESS_ID
+    sprintf outroot "%s/%s/%s/%s.%s.wrp.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $WARP_ID
 
     ## generate output log based on filerule (convert the URI to a PATH)
@@ -264,5 +269,5 @@
     mkdir $outpath
 
-    $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA --outroot $outroot
+    $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_dir $TESS_DIR --camera $CAMERA --outroot $outroot
     add_standard_args run