Changeset 27920

Timestamp:

May 11, 2010, 4:05:11 PM (16 years ago)

Author:

bills

Message:

when doing diff updates, use existing path_base

Location:

trunk

Files:

• ippTasks/diff.pro (modified) (2 diffs)
• ippTools/share/difftool_todiffskyfile.sql (modified) (1 diff)

trunk/ippTasks/diff.pro

@@ -184 +184 @@
     book getword diffSkyfile $pageName reduction -var REDUCTION
     book getword diffSkyfile $pageName diff_mode -var DIFF_MODE
+    book getword diffSkyfile $pageName path_base -var PATH_BASE
 
     # set the host and workdir based on the skycell hash
@@ -207 +208 @@
 
     basename $TESS_DIR -var TESS_ID
-    sprintf outroot "%s/%s/%s/%s.%s.%sdif.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $DIFF_TAG $DIFF_ID
+
+    if ("$PATH_BASE" == "NULL")
+        sprintf outroot "%s/%s/%s/%s.%s.%sdif.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $DIFF_TAG $DIFF_ID
+    else
+        $outroot = $PATH_BASE
+    end
 
     stdout $LOGDIR/diff.skycell.log

trunk/ippTools/share/difftool_todiffskyfile.sql

@@ -12 +12 @@
     diffRun.reduction,
     diffRun.bothways,
-    diffRun.diff_mode
+    diffRun.diff_mode,
+    diffSkyfile.path_base
 FROM diffRun
 JOIN diffInputSkyfile USING(diff_id)