Index: /branches/haf_add201112/ippScripts/scripts/addstar_run.pl =================================================================== --- /branches/haf_add201112/ippScripts/scripts/addstar_run.pl (revision 33026) +++ /branches/haf_add201112/ippScripts/scripts/addstar_run.pl (revision 33027) @@ -38,4 +38,5 @@ } my $minidvodb_path; +my $stage_extra1; my ( $add_id, $camera, $stage, $stage_id, $multi_num, $outroot, $stageroot, $dbname, $reduction, $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose, $no_update, $no_op, $redirect, $save_temps); @@ -151,4 +152,5 @@ #is this cam_id magicked or not? if ($magicked) { + $stage_extra1 = $magicked; $fpaObjects = $ipprc->destreaked_filename("$fpaObjects") or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR); print "cam_id is magicked, using $fpaObjects for the cam smf\n"; @@ -251,4 +253,5 @@ $fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path; $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; +$fpaCommand .= " -stage_extra1" if defined $stage_extra1; $fpaCommand .= " -dbname $dbname" if defined $dbname; print $fpaCommand; @@ -283,6 +286,8 @@ $command .= " -path_base $outroot" if defined $outroot; $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400)); - $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; + # $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; don't think we want it recorded (not sure) + $command .= " -stage_extra1 $stage_extra1" if defined $stage_extra1; $command .= " -dbname $dbname" if defined $dbname; + print $command; system ($command); } Index: /branches/haf_add201112/ippTasks/addstar.pro =================================================================== --- /branches/haf_add201112/ippTasks/addstar.pro (revision 33026) +++ /branches/haf_add201112/ippTasks/addstar.pro (revision 33027) @@ -53,10 +53,28 @@ macro addstar.revert.off - task addstar.revert + task addstar.revert.cam + active false + end + task addstar.revert.stack + active false + end + task addstar.revert.staticsky + active false + end + task addstar.revert.staticsky_multi active false end end macro addstar.revert.on - task addstar.revert + task addstar.revert.cam + active true + end + task addstar.revert.stack + active true + end + task addstar.revert.staticsky_multi + active true + end + task addstar.revert.staticsky active true end @@ -65,6 +83,10 @@ # this variable will cycle through the known database names -$addstar_DB = 0 -$addstar_revert_DB = 0 +$addstar_DB = 0 +#this may not work for more databases (addstar) will do that later) +$addstar_revert_DB_C = 0 +$addstar_revert_DB_S = 0 +$addstar_revert_DB_SS = 0 +$addstar_revert_DB_SSM = 0 @@ -415,5 +437,5 @@ end -task addstar.revert +task addstar.revert.cam host local @@ -429,13 +451,13 @@ task.exec if ($LABEL:n == 0) break - $run = addtool -revertprocessedexp - if ($DB:n == 0) - option DEFAULT - else - # save the DB name for the exit tasks - option $DB:$addstar_revert_DB - $run = $run -dbname $DB:$addstar_revert_DB - $addstar_revert_DB ++ - if ($addstar_revert_DB >= $DB:n) set addstar_revert_DB = 0 + $run = addtool -revertprocessedexp -stage cam + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$addstar_revert_DB_C + $run = $run -dbname $DB:$addstar_revert_DB_C + $addstar_revert_DB_C ++ + if ($addstar_revert_DB_C >= $DB:n) set addstar_revert_DB_C = 0 end add_poll_labels run @@ -461,2 +483,140 @@ end end +task addstar.revert.stack + host local + + periods -poll 5.0 + periods -exec 60.0 + periods -timeout 1200 + npending 1 + active false + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + if ($LABEL:n == 0) break + $run = addtool -revertprocessedexp -stage stack + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$addstar_revert_DB_S + $run = $run -dbname $DB:$addstar_revert_DB_S + $addstar_revert_DB_S ++ + if ($addstar_revert_DB_S >= $DB:n) set addstar_revert_DB_S = 0 + end + add_poll_labels run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end +task addstar.revert.staticsky + host local + + periods -poll 5.0 + periods -exec 60.0 + periods -timeout 1200 + npending 1 + active false + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + if ($LABEL:n == 0) break + $run = addtool -revertprocessedexp -stage staticsky + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$addstar_revert_DB_SS + $run = $run -dbname $DB:$addstar_revert_DB_SS + $addstar_revert_DB_SS ++ + if ($addstar_revert_DB_SS >= $DB:n) set addstar_revert_DB_SS = 0 + end + add_poll_labels run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end +task addstar.revert.staticsky_multi + host local + + periods -poll 5.0 + periods -exec 60.0 + periods -timeout 1200 + npending 1 + active false + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + if ($LABEL:n == 0) break + $run = addtool -revertprocessedexp -stage staticsky_multi + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$addstar_revert_DB_SSM + $run = $run -dbname $DB:$addstar_revert_DB_SSM + $addstar_revert_DB_SSM ++ + if ($addstar_revert_DB_SSM >= $DB:n) set addstar_revert_DB_SSM = 0 + end + add_poll_labels run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end Index: /branches/haf_add201112/ippTools/src/addtool.c =================================================================== --- /branches/haf_add201112/ippTools/src/addtool.c (revision 33026) +++ /branches/haf_add201112/ippTools/src/addtool.c (revision 33027) @@ -825,5 +825,5 @@ PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-minidvodb_name", false, false); PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); - + PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false); // generate restrictions psMetadata *where = psMetadataAlloc(); @@ -903,5 +903,19 @@ } } - + //if there is a stage_extra1, set it in addRun (it's not known until it is processed) + if (stage_extra1) { + psString setExtra = NULL; + psStringAppend (&setExtra, "UPDATE addRun set stage_extra1 = %" PRId64, stage_extra1); + psStringAppend (&setExtra, " where add_id = %" PRId64, row->add_id); + + if (!p_psDBRunQuery(config->dbh, setExtra)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + + return false; + } + } @@ -1050,5 +1064,5 @@ PXOPT_COPY_S64(config->args, where, "-add_id", "addRun.add_id", "=="); PXOPT_COPY_S64(config->args, where, "-stage_id", "addRun.stage_id", "=="); - PXOPT_LOOKUP_STR(stage, config->args, "-stage", false, false); + PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false); pxcamGetSearchArgs (config, where); pxAddLabelSearchArgs (config, where, "-label", "addRun.label", "=="); Index: /branches/haf_add201112/ippTools/src/addtoolConfig.c =================================================================== --- /branches/haf_add201112/ippTools/src/addtoolConfig.c (revision 33026) +++ /branches/haf_add201112/ippTools/src/addtoolConfig.c (revision 33027) @@ -115,4 +115,6 @@ psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_addstar", 0, "define elapsed time for DVO insertion (seconds)", NAN); psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); +psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-stage_extra1", 0, "set stage_extra1", 0); + // -processedexp