Changeset 17965 for trunk/ippTasks

Timestamp:

Jun 6, 2008, 2:29:32 PM (18 years ago)

Author:

bills

Message:

move register.pro to the new logfile scheme

Location:

trunk/ippTasks

Files:

• pantasks.pro (modified) (1 diff)
• register.pro (modified) (5 diffs)

trunk/ippTasks/pantasks.pro

@@ -7 +7 @@
 $VERBOSE = 1
 $LOGDIR = `pwd`
+$LOGDIR = $LOGDIR/pantasks_logs
 $KEEP_FAILURES = 0
 

trunk/ippTasks/register.pro

@@ -6 +6 @@
 check.globals
 
-$LOGSUBDIR = $LOGDIR/register
-exec mkdir -p $LOGSUBDIR
+exec mkdir -p $LOGDIR
 
 book init regPendingImfile
@@ -69 +68 @@
   # silently drop stdout
   stdout NULL
-  stderr $LOGSUBDIR/register.imfile.log
+  stderr $LOGDIR/register.imfile.load.log
 
   # select entries from the current DB; cycle to the next DB, if it exists
@@ -159 +158 @@
     sprintf logfile "%s/%s/%s.reg.%s.log" $WORKDIR $EXP_TAG $EXP_TAG $TMP_CLASS_ID
 
-    ## generate output log based on filerule (convert the URI to a PATH)
-    ## note that we use ipp_datapath here not ipp_filename because the CAMERA name is not yet controlled
-    $logfile = `ipp_datapath.pl --touch $logfile`
-    if ("$logfile" == "") 
-      echo "WARNING: logfile not defined in register.pro:165"
-      break
-    end
-    substr $WORKDIR 0 4 scheme
-    if ("$scheme" != "neb:")
-        dirname $logfile -var outpath
-        mkdir $outpath
-    end
-    stdout $logfile
-    stderr $logfile
-
-    # XXX should this comment be deleted
-    # add mkdir back here?
-    # or make part of reigster_imfile.pl?
-
-    $run = register_imfile.pl --exp_id $EXP_ID --tmp_class_id $TMP_CLASS_ID --tmp_exp_name $TMP_EXP_NAME --uri $URI
+    stdout $LOGDIR/register.imfile.run.log
+    stderr $LOGDIR/register.imfile.run.log
+
+    $run = register_imfile.pl --exp_id $EXP_ID --tmp_class_id $TMP_CLASS_ID --tmp_exp_name $TMP_EXP_NAME --uri $URI --logfile $logfile
     add_standard_args run
 
@@ -213 +196 @@
 
   stdout NULL
-  stderr $LOGSUBDIR/register.exp.log
+  stderr $LOGDIR/register.exp.load.log
 
   task.exec
@@ -292 +275 @@
     sprintf logfile "%s/%s/%s.reg.log" $WORKDIR $EXP_TAG $EXP_TAG
 
-    ## generate output log based on filerule (convert the URI to a PATH)
-    ## note that we use ipp_datapath here not ipp_filename because the CAMERA name is not yet controlled
-    $logfile = `ipp_datapath.pl --touch $logfile`
-    if ("$logfile" == "") 
-      echo "WARNING: logfile not defined in register.pro:298"
-      break
-    end
-    substr $WORKDIR 0 4 scheme
-    if ("$scheme" != "neb:")
-        dirname $logfile -var outpath
-        mkdir $outpath
-    end
-    stdout $logfile
-    stderr $logfile
-
-    $run = register_exp.pl --exp_id $EXP_ID --exp_tag $EXP_TAG
+    stdout $LOGDIR/register.exp.run.log
+    stderr $LOGDIR/register.exp.run.log
+
+    $run = register_exp.pl --exp_id $EXP_ID --exp_tag $EXP_TAG --logfile $logfile
     add_standard_args run