Index: /branches/czw_branch/cleanup/ippScripts/scripts/ipp_cleanup.pl =================================================================== --- /branches/czw_branch/cleanup/ippScripts/scripts/ipp_cleanup.pl (revision 24742) +++ /branches/czw_branch/cleanup/ippScripts/scripts/ipp_cleanup.pl (revision 24743) @@ -60,8 +60,8 @@ -my %stages = ( chip => 1, camera => 1, fake => 1, warp => 1, stack => 1, diff => 1, - detrend.process.imfile => 1, detrend.process.exp => 1, detrend.stack.imfile => 1, - detrend.normstat.imfile => 1, detrend.norm.imfile => 1, detrend.norm.exp => 1, - detrend.resid.imfile => 1, detrend.resid.exp => 1 ); +my %stages = ( "chip" => 1, "camera" => 1, "fake" => 1, "warp" => 1, "stack" => 1, "diff" => 1, + "detrend.process.imfile" => 1, "detrend.process.exp" => 1, "detrend.stack.imfile" => 1, + "detrend.normstat.imfile" => 1, "detrend.norm.imfile" => 1, "detrend.norm.exp" => 1, + "detrend.resid.imfile" => 1, "detrend.resid.exp" => 1 ); unless ($stages{$stage}) { die "unknown stage $stage for ipp_cleanup.pl\n"; @@ -119,7 +119,8 @@ # don't clean up unless the data needed to update is available # modes goto_purged and goto_scrubbed will remove files even if the config is non-existent + # goto_scrubbed now requires the config file to not exist. if ($mode eq "goto_cleaned") { my $config_file = $ipprc->filename("PPIMAGE.CONFIG", $path_base, $class_id); - print STDERR "CHIP: CONFIG_FILE : $config_file\n"; + if (!$config_file or ! -e $config_file) { print STDERR "skipping cleanup for chipRun $stage_id $class_id " @@ -128,4 +129,13 @@ } } + elsif ($mode eq "goto_scrubbed") { + my $config_file = $ipprc->filename("PPIMAGE.CONFIG", $path_base, $class_id); + + if ($config_file and -e $config_file) { + print STDERR "skipping scrubbed for chipRun $stage_id $class_id " + . " because config file is present\n"; + $status = 0; + } + } if ($status) { @@ -160,7 +170,12 @@ if ($mode eq "goto_purged") { $command .= " -topurgedimfile"; - } else { + } + elsif ($mode eq "goto_cleaned") { $command .= " -tocleanedimfile"; } + elsif ($mode eq "goto_scrubbed") { + $command .= " -toscrubbedimfile"; + } + $command .= " -dbname $dbname" if defined $dbname; @@ -218,4 +233,5 @@ my $status = 1; # don't clean up unless the data needed to update is available + # goto_scrubbed now requires the config file to not be present if ($mode eq "goto_cleaned") { my $config_file = $ipprc->filename("PSASTRO.CONFIG", $path_base); @@ -225,4 +241,12 @@ $status = 0; } + } + elsif ($mode eq "goto_scrubbed") { + my $config_file = $ipprc->filename("PSASTRO.CONFIG", $path_base); + + if ($config_file and -e $config_file) { + print STDERR "skipping cleanup for camRun $stage_id because config file ($config_file) is present\n"; + $status = 0; + } } if ($status) { @@ -246,5 +270,5 @@ } if ($mode eq "goto_scrubbed") { - $command = "$camtool -updaterun -cam_id $stage_id -set_state cleaned"; + $command = "$camtool -updaterun -cam_id $stage_id -set_state scrubbed"; } if ($mode eq "goto_purged") { @@ -311,4 +335,13 @@ } } + elsif ($mode eq "goto_scrubbed") { + my $config_file = $ipprc->filename("PSWARP.CONFIG", $path_base, $skycell_id); + + if ($config_file and -e $config_file) { + print STDERR "skipping scrubbed for warpRun $stage_id $skycell_id" . + " because config file is present\n"; + $status = 0; + } + } if ($status) { # delete the temporary image datafiles @@ -337,7 +370,11 @@ if ($mode eq "goto_purged") { $command .= " -topurgedskyfile"; - } else { + } + elsif ($mode eq "goto_cleaned") { $command .= " -tocleanedskyfile"; } + elsif ($mode eq "goto_scrubbed") { + $command .= " -toscrubbedskyfile"; + } $command .= " -dbname $dbname" if defined $dbname; @@ -395,6 +432,5 @@ if ($mode eq "goto_cleaned") { my $config_file = $ipprc->filename("PPSTACK.CONFIG", $path_base, $skycell_id); - print STDERR "MY CONFIG FILE = $config_file\n"; - printf(STDERR "BOOLS: %d %d %d %s\n",!$config_file, ! -e $config_file, -e $config_file,$config_file); + $config_file =~ s%^file://%%; if (!$config_file or ! -e $config_file) { @@ -404,4 +440,13 @@ } $config_file = 'file://' . $config_file; + } + elsif ($mode eq "goto_scrubbed") { + my $config_file = $ipprc->filename("PPSTACK.CONFIG", $path_base, $skycell_id); + $config_file =~ s%^file://%%; + if ($config_file and -e $config_file) { + print STDERR "skipping scrubbed for stackRun $stage_id $skycell_id" . + " because config file is present\n"; + $status = 0; + } } if ($status) { @@ -428,6 +473,10 @@ if ($mode eq "goto_purged") { $command .= " -updaterun -state purged"; - } else { + } + elsif ($mode eq "goto_cleaned") { $command .= " -updaterun -state cleaned"; + } + elsif ($mode eq "goto_scrubbed") { + $command .= " -updaterun -state scrubbed"; } $command .= " -dbname $dbname" if defined $dbname; @@ -485,6 +534,5 @@ if ($mode eq "goto_cleaned") { my $config_file = $ipprc->filename("PPSUB.CONFIG", $path_base, $skycell_id); - print STDERR "MY CONFIG FILE = $config_file\n"; - printf(STDERR "BOOLS: %d %d %d %s\n",!$config_file, ! -e $config_file, -e $config_file,$config_file); + $config_file =~ s%^file://%%; if (!$config_file or ! -e $config_file) { @@ -494,4 +542,13 @@ } $config_file = 'file://' . $config_file; + } + elsif ($mode eq "goto_scrubbed") { + my $config_file = $ipprc->filename("PPSUB.CONFIG", $path_base, $skycell_id); + $config_file =~ s%^file://%%; + if ($config_file and -e $config_file) { + print STDERR "skipping scrubbed for diffRun $stage_id $skycell_id" . + " because config file ($config_file) is present\n"; + $status = 0; + } } if ($status) { @@ -529,10 +586,15 @@ if ($status) { my $command = "$difftool -diff_id $stage_id"; -# my $command = "$difftool -diff_id $stage_id -skycell_id $skycell_id"; + if ($mode eq "goto_purged") { $command .= " -updaterun -state purged"; - } else { + } + elsif ($mode eq "goto_cleaned") { $command .= " -updaterun -state cleaned"; } + elsif ($mode eq "goto_scrubbed") { + $command .= " -updaterun -state scrubbed"; + } + $command .= " -dbname $dbname" if defined $dbname; @@ -545,5 +607,5 @@ } else { my $command = "$difftool -updaterun -diff_id $stage_id -state $error_state"; -# my $command = "$difftool -updaterun -diff_id $stage_id -skycell_id $skycell_id -state $error_state"; + $command .= " -dbname $dbname" if defined $dbname; @@ -560,5 +622,128 @@ } if ($stage eq 'fake') { - die "ipp_cleanup.pl -stage fake not yet implemented. Probably will just mark database cleaned.\n"; + print STDERR "This does not seem to work at present, as no files exist. Terminating quietly.\n"; + exit(0); + die "--stage_id required for stage fake\n" if !$stage_id; + ### select the imfiles for this entry + + # this stage uses 'chiptool' + my $faketool = can_run('faketool') or die "Can't find faketool"; + + # Get list of component imfiles + # XXX may need a different my_die for each stage + my $imfiles; # Array of component files + my $command = "$faketool -pendingcleanupimfile -fake_id $stage_id"; # Command to run + $command .= " -dbname $dbname" if defined $dbname; + my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose); + unless ($success) { + $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); + &my_die("Unable to perform faketool: $error_code", "fake", $stage_id, $error_code); + } + + # if there are no fakeProcessedImfiles (@$stdout_buf == 0), the reset the state to 'new' + if (@$stdout_buf == 0) { + my $command = "$faketool -fake_id $stage_id -updaterun -set_state new"; + $command .= " -dbname $dbname" if defined $dbname; + + my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = + run(command => $command, verbose => $verbose); + unless ($success) { + $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); + &my_die("Unable to perform faketool: $error_code", "fake", $stage_id, $error_code); + } + exit 0; + } + + my $metadata = $mdcParser->parse(join "", @$stdout_buf) or + &my_die("Unable to parse metadata config doc", "fake", $stage_id, $PS_EXIT_PROG_ERROR); + + # extract the metadata for the files into a hash list + $imfiles = parse_md_list($metadata) or + &my_die("Unable to parse metadata list", "fake", $stage_id, $PS_EXIT_PROG_ERROR); + + # loop over all of the imfiles, determine the path_base and class_id for each + foreach my $imfile (@$imfiles) { + my $class_id = $imfile->{class_id}; + my $path_base = $imfile->{path_base}; + my $status = 1; + + # don't clean up unless the data needed to update is available + # modes goto_purged and goto_scrubbed will remove files even if the config is non-existent + # goto_scrubbed now requires the config file to not exist. + if ($mode eq "goto_cleaned") { + my $config_file = $ipprc->filename("PPSIM.CONFIG", $path_base, $class_id); + + if (!$config_file or ! -e $config_file) { + print STDERR "skipping cleanup for fakeRun $stage_id $class_id " + . " because config file is missing\n"; + $status = 0; + } + } + elsif ($mode eq "goto_scrubbed") { + my $config_file = $ipprc->filename("PPSIM.CONFIG", $path_base, $class_id); + + if ($config_file and -e $config_file) { + print STDERR "skipping scrubbed for fakeRun $stage_id $class_id " + . " because config file is present\n"; + $status = 0; + } + } + + if ($status) { + # array of actual filenames to delete + my @files = (); + + # delete the temporary image datafiles + addFilename (\@files, "PPSIM.OUTPUT.MEF", $path_base, $class_id); + addFilename (\@files, "PPSIM.OUTPUT.SPL", $path_base, $class_id); + addFilename (\@files, "PPSIM.FAKE.CHIP", $path_base, $class_id); + addFilename (\@files, "PPSIM.FORCE.CHIP", $path_base, $class_id); + if ($mode eq "goto_purged") { + # additional files to remove for 'purge' mode + addFilename (\@files, "PPSIM.SOURCES", $path_base, $class_id); + addFilename (\@files, "PPSIM.FAKE.SOURCES", $path_base, $class_id); + addFilename (\@files, "PPSIM.FORCE.SOURCES", $path_base, $class_id); + } + + # actual command to delete the files + $status = &delete_files (\@files); + } + + if ($status) { + my $command = "$faketool -fake_id $stage_id -class_id $class_id"; + if ($mode eq "goto_purged") { + $command .= " -topurgedimfile"; + } + elsif ($mode eq "goto_cleaned") { + $command .= " -tocleanedimfile"; + } + elsif ($mode eq "goto_scrubbed") { + $command .= " -toscrubbedimfile"; + } + + $command .= " -dbname $dbname" if defined $dbname; + + my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = + run(command => $command, verbose => $verbose); + unless ($success) { + $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); + &my_die("Unable to perform faketool: $error_code", "fake", $stage_id, $error_code); + } + } else { + + # if an error happens for one chip, the chipRun will stay in goto_*, but the chips will go to error_* (matching the goto_*) + my $command = "$faketool -updateprocessedimfile -fake_id $stage_id -class_id $class_id -set_state $error_state"; + $command .= " -dbname $dbname" if defined $dbname; + + my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = + run(command => $command, verbose => $verbose); + unless ($success) { + $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); + &my_die("Unable to perform faketool: $error_code", "fake", $stage_id, $error_code); + } + } + } + exit 0; + } # fake : faketool : -pendingcleanupimfile (loop over imfiles) Index: /branches/czw_branch/cleanup/ippTasks/Makefile.am =================================================================== --- /branches/czw_branch/cleanup/ippTasks/Makefile.am (revision 24742) +++ /branches/czw_branch/cleanup/ippTasks/Makefile.am (revision 24743) @@ -24,5 +24,6 @@ pstamp.pro \ receive.pro \ - publish.pro + publish.pro \ + science.cleanup.pro other_files = \ Index: /branches/czw_branch/cleanup/ippTools/share/camtool_pendingcleanupexp.sql =================================================================== --- /branches/czw_branch/cleanup/ippTools/share/camtool_pendingcleanupexp.sql (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/share/camtool_pendingcleanupexp.sql (revision 24743) @@ -13,4 +13,4 @@ USING(cam_id) WHERE - (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged') + (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged' OR camRun.state = 'goto_scrubbed') Index: /branches/czw_branch/cleanup/ippTools/share/camtool_pendingcleanuprun.sql =================================================================== --- /branches/czw_branch/cleanup/ippTools/share/camtool_pendingcleanuprun.sql (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/share/camtool_pendingcleanuprun.sql (revision 24743) @@ -9,3 +9,3 @@ USING (exp_id) WHERE - (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged') + (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged' OR camRun.state = 'goto_scrubbed') Index: /branches/czw_branch/cleanup/ippTools/share/faketool_pendingcleanupimfile.sql =================================================================== --- /branches/czw_branch/cleanup/ippTools/share/faketool_pendingcleanupimfile.sql (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/share/faketool_pendingcleanupimfile.sql (revision 24743) @@ -13,3 +13,7 @@ USING(fake_id) WHERE - fakeRun.state = 'goto_cleaned' + ((fakeRun.state = 'goto_cleaned' AND fakeProcessedImfile.data_state = 'full') +OR + (fakeRun.state = 'goto_scrubbed' AND fakeProcessedImfile.data_state = 'full') +OR + (fakeRun.state = 'goto_purged' AND fakeProcessedImfile.data_state != 'purged')) Index: /branches/czw_branch/cleanup/ippTools/share/faketool_pendingcleanuprun.sql =================================================================== --- /branches/czw_branch/cleanup/ippTools/share/faketool_pendingcleanuprun.sql (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/share/faketool_pendingcleanuprun.sql (revision 24743) @@ -11,3 +11,4 @@ USING (exp_id) WHERE - fakeRun.state = 'goto_cleaned' + (fakeRun.state = 'goto_cleaned' OR fakeRun.state = 'goto_scrubbed' OR fakeRun.state = 'goto_purged') + Index: /branches/czw_branch/cleanup/ippTools/src/chiptool.c =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/chiptool.c (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/chiptool.c (revision 24743) @@ -54,4 +54,5 @@ static bool tofullimfileMode(pxConfig *config); static bool topurgedimfileMode(pxConfig *config); +static bool toscrubbedimfileMode(pxConfig *config); static bool exportrunMode(pxConfig *config); static bool importrunMode(pxConfig *config); @@ -93,4 +94,5 @@ MODECASE(CHIPTOOL_MODE_TOFULLIMFILE, tofullimfileMode); MODECASE(CHIPTOOL_MODE_TOPURGEDIMFILE, topurgedimfileMode); + MODECASE(CHIPTOOL_MODE_TOSCRUBBEDIMFILE, toscrubbedimfileMode); MODECASE(CHIPTOOL_MODE_EXPORTRUN, exportrunMode); MODECASE(CHIPTOOL_MODE_IMPORTRUN, importrunMode); @@ -1333,5 +1335,8 @@ return change_imfile_data_state(config, "purged", "goto_purged"); } - +static bool toscrubbedimfileMode(pxConfig *config) +{ + return change_imfile_data_state(config, "scrubbed", "goto_scrubbed"); +} bool exportrunMode(pxConfig *config) { Index: /branches/czw_branch/cleanup/ippTools/src/chiptool.h =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/chiptool.h (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/chiptool.h (revision 24743) @@ -45,4 +45,5 @@ CHIPTOOL_MODE_TOFULLIMFILE, CHIPTOOL_MODE_TOPURGEDIMFILE, + CHIPTOOL_MODE_TOSCRUBBEDIMFILE, CHIPTOOL_MODE_EXPORTRUN, CHIPTOOL_MODE_IMPORTRUN Index: /branches/czw_branch/cleanup/ippTools/src/chiptoolConfig.c =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/chiptoolConfig.c (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/chiptoolConfig.c (revision 24743) @@ -248,4 +248,9 @@ psMetadataAddStr(topurgedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "class ID to update", NULL); + // -toscrubbedimfile + psMetadata *toscrubbedimfileArgs = psMetadataAlloc(); + psMetadataAddS64(toscrubbedimfileArgs, PS_LIST_TAIL, "-chip_id", 0, "chip ID to update", 0); + psMetadataAddStr(toscrubbedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "class ID to update", NULL); + // -exportrun psMetadata *exportrunArgs = psMetadataAlloc(); @@ -282,4 +287,5 @@ PXOPT_ADD_MODE("-tofullimfile", "set imfile state to full", CHIPTOOL_MODE_TOFULLIMFILE, tofullimfileArgs); PXOPT_ADD_MODE("-topurgedimfile", "set imfile state to purged", CHIPTOOL_MODE_TOPURGEDIMFILE, topurgedimfileArgs); + PXOPT_ADD_MODE("-toscrubbedimfile", "set imfile state to scrubbed", CHIPTOOL_MODE_TOSCRUBBEDIMFILE, toscrubbedimfileArgs); PXOPT_ADD_MODE("-exportrun", "export run for import on other database", CHIPTOOL_MODE_EXPORTRUN, exportrunArgs); Index: /branches/czw_branch/cleanup/ippTools/src/faketool.c =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/faketool.c (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/faketool.c (revision 24743) @@ -52,4 +52,5 @@ static bool tofullimfileMode(pxConfig *config); static bool topurgedimfileMode(pxConfig *config); +static bool toscrubbedimfileMode(pxConfig *config); static bool exportrunMode(pxConfig *config); static bool importrunMode(pxConfig *config); @@ -91,4 +92,5 @@ MODECASE(FAKETOOL_MODE_TOFULLIMFILE, tofullimfileMode); MODECASE(FAKETOOL_MODE_TOPURGEDIMFILE, topurgedimfileMode); + MODECASE(FAKETOOL_MODE_TOSCRUBBEDIMFILE, toscrubbedimfileMode); MODECASE(FAKETOOL_MODE_EXPORTRUN, exportrunMode); MODECASE(FAKETOOL_MODE_IMPORTRUN, importrunMode); @@ -1251,4 +1253,8 @@ return change_imfile_data_state(config, "purged", "goto_purged"); } +static bool toscrubbedimfileMode(pxConfig *config) +{ + return change_imfile_data_state(config, "scrubbed", "goto_scrubbed"); +} bool exportrunMode(pxConfig *config) Index: /branches/czw_branch/cleanup/ippTools/src/faketool.h =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/faketool.h (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/faketool.h (revision 24743) @@ -45,4 +45,5 @@ FAKETOOL_MODE_TOFULLIMFILE, FAKETOOL_MODE_TOPURGEDIMFILE, + FAKETOOL_MODE_TOSCRUBBEDIMFILE, FAKETOOL_MODE_EXPORTRUN, FAKETOOL_MODE_IMPORTRUN Index: /branches/czw_branch/cleanup/ippTools/src/faketoolConfig.c =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/faketoolConfig.c (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/faketoolConfig.c (revision 24743) @@ -301,4 +301,9 @@ psMetadataAddStr(topurgedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "class ID to update", NULL); + // -toscrubbedimfile + psMetadata *toscrubbedimfileArgs = psMetadataAlloc(); + psMetadataAddS64(toscrubbedimfileArgs, PS_LIST_TAIL, "-fake_id", 0, "fake ID to update", 0); + psMetadataAddStr(toscrubbedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "class ID to update", NULL); + // -exportrun psMetadata *exportrunArgs = psMetadataAlloc(); @@ -337,4 +342,5 @@ PXOPT_ADD_MODE("-tofullimfile", "set imfile state to full", FAKETOOL_MODE_TOFULLIMFILE, tofullimfileArgs); PXOPT_ADD_MODE("-topurgedimfile", "set imfile state to purged", FAKETOOL_MODE_TOPURGEDIMFILE, topurgedimfileArgs); + PXOPT_ADD_MODE("-toscrubbedimfile", "set imfile state to scrubbed", FAKETOOL_MODE_TOSCRUBBEDIMFILE, toscrubbedimfileArgs); PXOPT_ADD_MODE("-exportrun", "export run for import on other database", FAKETOOL_MODE_EXPORTRUN, exportrunArgs); PXOPT_ADD_MODE("-importrun", "import run from metadata file", FAKETOOL_MODE_IMPORTRUN, importrunArgs); Index: /branches/czw_branch/cleanup/ippTools/src/pxtools.c =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/pxtools.c (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/pxtools.c (revision 24743) @@ -37,4 +37,6 @@ if (!strcmp(state, "goto_cleaned")) return true; if (!strcmp(state, "error_cleaned")) return true; + if (!strcmp(state, "goto_purged")) return true; + if (!strcmp(state, "error_purged")) return true; if (!strcmp(state, "goto_scrubbed")) return true; if (!strcmp(state, "error_scrubbed")) return true; @@ -42,12 +44,11 @@ if (!strcmp(state, "update")) return true; if (!strcmp(state, "purged")) return true; - if (!strcmp(state, "goto_purged")) return true; - if (!strcmp(state, "error_purged")) return true; - + if (!strcmp(state, "scrubbed")) return true; return false; } -// 'scrubbed' is a virtual state equivalent to cleaned, but allows files to be removed -// even if the config files is missing +// 'scrubbed' is no longer a virtual state equivalent to cleaned, but allows files to be removed +// even if the config files is missing. This change was prompted as files that are cleaned can +// be regenerated, but that is not certain after being scrubbed. Index: /branches/czw_branch/cleanup/ippTools/src/warptool.c =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/warptool.c (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/warptool.c (revision 24743) @@ -53,4 +53,5 @@ static bool tocleanedskyfileMode(pxConfig *config); static bool topurgedskyfileMode(pxConfig *config); +static bool toscrubbedskyfileMode(pxConfig *config); static bool tofullskyfileMode(pxConfig *config); static bool updateskyfileMode(pxConfig *config); @@ -102,4 +103,5 @@ MODECASE(WARPTOOL_MODE_TOCLEANEDSKYFILE, tocleanedskyfileMode); MODECASE(WARPTOOL_MODE_TOPURGEDSKYFILE, topurgedskyfileMode); + MODECASE(WARPTOOL_MODE_TOSCRUBBEDSKYFILE, toscrubbedskyfileMode); MODECASE(WARPTOOL_MODE_TOFULLSKYFILE, tofullskyfileMode); MODECASE(WARPTOOL_MODE_UPDATESKYFILE, updateskyfileMode); @@ -1666,4 +1668,8 @@ return change_skyfile_data_state(config, "purged", "goto_purged"); } +static bool toscrubbedskyfileMode(pxConfig *config) +{ + return change_skyfile_data_state(config, "scrubbed", "goto_scrubbed"); +} static bool updateskyfileMode(pxConfig *config) Index: /branches/czw_branch/cleanup/ippTools/src/warptool.h =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/warptool.h (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/warptool.h (revision 24743) @@ -49,4 +49,5 @@ WARPTOOL_MODE_TOCLEANEDSKYFILE, WARPTOOL_MODE_TOPURGEDSKYFILE, + WARPTOOL_MODE_TOSCRUBBEDSKYFILE, WARPTOOL_MODE_TOFULLSKYFILE, WARPTOOL_MODE_UPDATESKYFILE, Index: /branches/czw_branch/cleanup/ippTools/src/warptoolConfig.c =================================================================== --- /branches/czw_branch/cleanup/ippTools/src/warptoolConfig.c (revision 24742) +++ /branches/czw_branch/cleanup/ippTools/src/warptoolConfig.c (revision 24743) @@ -278,4 +278,9 @@ psMetadataAddStr(topurgedskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update", NULL); + // -toscrubbedskyfile + psMetadata *toscrubbedskyfileArgs = psMetadataAlloc(); + psMetadataAddS64(toscrubbedskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "warptool ID to update", 0); + psMetadataAddStr(toscrubbedskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update", NULL); + // -tofullskyfile psMetadata *tofullskyfileArgs = psMetadataAlloc(); @@ -327,4 +332,5 @@ PXOPT_ADD_MODE("-tocleanedskyfile", "set skyfile as cleaned", WARPTOOL_MODE_TOCLEANEDSKYFILE, tocleanedskyfileArgs); PXOPT_ADD_MODE("-topurgedskyfile", "set skyfile as purged", WARPTOOL_MODE_TOPURGEDSKYFILE, topurgedskyfileArgs); + PXOPT_ADD_MODE("-toscrubbedskyfile", "set skyfile as scrubbed", WARPTOOL_MODE_TOSCRUBBEDSKYFILE, toscrubbedskyfileArgs); PXOPT_ADD_MODE("-tofullskyfile", "set skyfile as full (updated)", WARPTOOL_MODE_TOFULLSKYFILE, tofullskyfileArgs); PXOPT_ADD_MODE("-updateskyfile", "update fault code for skyfile", WARPTOOL_MODE_UPDATESKYFILE, updateskyfileArgs);