Index: /trunk/ippTools/scripts/regtest.sh =================================================================== --- /trunk/ippTools/scripts/regtest.sh (revision 18365) +++ /trunk/ippTools/scripts/regtest.sh (revision 18366) @@ -35,5 +35,6 @@ $regtool -pendingexp|| exit 1 -$regtool -addprocessedexp -exp_id $exp_id1 -exp_name t10 -inst gpc -telescope ps1 -exp_tag batman.t10 -filelevel OTA -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar -tess_id moldyshoe $* || exit 1 +$regtool -addprocessedexp -exp_id $exp_id1 -exp_name t10 -inst gpc -telescope ps1 -exp_tag batman.t10 -filelevel OTA -filter r -airmass 10 -ra 1 -decl 2 -exp_type object -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar -tess_id moldyshoe $* || exit 1 +# use BIAS or OBJECT? $regtool -addprocessedexp -exp_id $exp_id1 -exp_name t10 -inst gpc -telescope ps1 -exp_tag batman.t10 -filelevel OTA -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar -tess_id moldyshoe $* || exit 1 $regtool -pendingimfile || exit 1 @@ -45,3 +46,4 @@ $regtool -pendingexp|| exit 1 -$regtool -addprocessedexp -exp_id $exp_id2 -exp_name t11 -inst gpc -telescope ps1 -exp_tag batman.t11 -filelevel OTA -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar -tess_id moldyshoe $* || exit 1 +$regtool -addprocessedexp -exp_id $exp_id2 -exp_name t11 -inst gpc -telescope ps1 -exp_tag batman.t11 -filelevel OTA -filter r -airmass 11 -ra 1 -decl 2 -exp_type object -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar -tess_id moldyshoe $* || exit 1 +# BIAS or OBJECT? $regtool -addprocessedexp -exp_id $exp_id2 -exp_name t11 -inst gpc -telescope ps1 -exp_tag batman.t11 -filelevel OTA -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar -tess_id moldyshoe $* || exit 1 Index: /trunk/ippTools/share/Makefile.am =================================================================== --- /trunk/ippTools/share/Makefile.am (revision 18365) +++ /trunk/ippTools/share/Makefile.am (revision 18366) @@ -11,7 +11,9 @@ chiptool_find_rawexp.sql \ chiptool_find_unprocessed_imfile.pl \ - chiptool_pendingcleanup.sql \ + chiptool_pendingcleanuprun.sql \ + chiptool_pendingcleanupimfile.sql \ chiptool_pendingimfile.sql \ chiptool_processedimfile.sql \ + chiptool_run.sql \ chiptool_revertprocessedimfile.sql \ chiptool_unmasked.sql \ Index: /trunk/ippTools/share/camtool_find_chip_id.sql =================================================================== --- /trunk/ippTools/share/camtool_find_chip_id.sql (revision 18365) +++ /trunk/ippTools/share/camtool_find_chip_id.sql (revision 18366) @@ -29,3 +29,3 @@ using(exp_id) WHERE - chipRun.state = 'stop') as Foo + chipRun.state = 'full') as Foo Index: /trunk/ippTools/share/camtool_find_pendingexp.sql =================================================================== --- /trunk/ippTools/share/camtool_find_pendingexp.sql (revision 18365) +++ /trunk/ippTools/share/camtool_find_pendingexp.sql (revision 18366) @@ -24,5 +24,5 @@ ON camRun.label = camMask.label WHERE - chipRun.state = 'stop' + chipRun.state = 'full' AND camRun.state = 'run' AND camMask.label IS NULL Index: /trunk/ippTools/share/camtool_queue_chip_id.sql =================================================================== --- /trunk/ippTools/share/camtool_queue_chip_id.sql (revision 18365) +++ /trunk/ippTools/share/camtool_queue_chip_id.sql (revision 18366) @@ -16,4 +16,4 @@ FROM chipRun WHERE - chipRun.state = 'stop' + chipRun.state = 'full' AND chipRun.chip_id = %lld Index: unk/ippTools/share/chiptool_pendingcleanup.sql =================================================================== --- /trunk/ippTools/share/chiptool_pendingcleanup.sql (revision 18365) +++ (revision ) @@ -1,5 +1,0 @@ -SELECT - chipRun.* -FROM chipRun -WHERE - chipRun.state = 'goto_clean' Index: /trunk/ippTools/share/chiptool_pendingcleanupimfile.sql =================================================================== --- /trunk/ippTools/share/chiptool_pendingcleanupimfile.sql (revision 18366) +++ /trunk/ippTools/share/chiptool_pendingcleanupimfile.sql (revision 18366) @@ -0,0 +1,15 @@ +SELECT + chipProcessedImfile.*, + chipRun.state, + chipRun.workdir, + chipRun.label, + chipRun.reduction, + chipRun.expgroup, + chipRun.dvodb, + chipRun.tess_id, + chipRun.end_stage +FROM chipRun +JOIN chipProcessedImfile + USING(chip_id) +WHERE + chipRun.state = 'goto_cleaned' Index: /trunk/ippTools/share/chiptool_pendingcleanuprun.sql =================================================================== --- /trunk/ippTools/share/chiptool_pendingcleanuprun.sql (revision 18366) +++ /trunk/ippTools/share/chiptool_pendingcleanuprun.sql (revision 18366) @@ -0,0 +1,9 @@ +SELECT + chipRun.chip_id, + rawExp.camera, + chipRun.state +FROM chipRun +JOIN rawExp +USING (exp_id) +WHERE + chipRun.state = 'goto_cleaned' Index: /trunk/ippTools/share/chiptool_pendingimfile.sql =================================================================== --- /trunk/ippTools/share/chiptool_pendingimfile.sql (revision 18365) +++ /trunk/ippTools/share/chiptool_pendingimfile.sql (revision 18366) @@ -20,5 +20,5 @@ ON chipRun.label = chipMask.label WHERE - chipRun.state = 'run' + chipRun.state = 'new' AND chipProcessedImfile.chip_id IS NULL AND chipProcessedImfile.exp_id IS NULL Index: /trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql =================================================================== --- /trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql (revision 18365) +++ /trunk/ippTools/share/flatcorr_completely_processed_chiprun.sql (revision 18366) @@ -26,5 +26,5 @@ AND rawImfile.class_id = chipProcessedImfile.class_id WHERE - chipRun.state = 'stop' + chipRun.state = 'full' GROUP BY chipRun.chip_id, Index: /trunk/ippTools/share/flatcorr_find_processedimfiles.sql =================================================================== --- /trunk/ippTools/share/flatcorr_find_processedimfiles.sql (revision 18365) +++ /trunk/ippTools/share/flatcorr_find_processedimfiles.sql (revision 18366) @@ -11,4 +11,4 @@ WHERE flatcorrRun.state = 'run' - AND chipRun.state = 'stop' + AND chipRun.state = 'new' Index: /trunk/ippTools/share/flatcorr_pending.sql =================================================================== --- /trunk/ippTools/share/flatcorr_pending.sql (revision 18365) +++ /trunk/ippTools/share/flatcorr_pending.sql (revision 18366) @@ -15,5 +15,5 @@ WHERE flatcorrRun.state = 'run' - AND chipRun.state = 'stop' + AND chipRun.state = 'full' GROUP BY chipRun.chip_id, Index: /trunk/ippTools/src/Makefile.am =================================================================== --- /trunk/ippTools/src/Makefile.am (revision 18365) +++ /trunk/ippTools/src/Makefile.am (revision 18366) @@ -71,4 +71,5 @@ pxregister.c \ pxtag.c \ + pxtools.c \ pxtoolsErrorCodes.c \ pxtree.c \ Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 18365) +++ /trunk/ippTools/src/chiptool.c (revision 18366) @@ -45,6 +45,8 @@ static bool unmaskedMode(pxConfig *config); static bool unblockMode(pxConfig *config); -static bool pendingcleanupMode(pxConfig *config); +static bool pendingcleanuprunMode(pxConfig *config); +static bool pendingcleanupimfileMode(pxConfig *config); static bool donecleanupMode(pxConfig *config); +static bool runMode(pxConfig *config); static bool chipProcessedCompleteExp(pxConfig *config); @@ -67,5 +69,5 @@ switch (config->mode) { - MODECASE(CHIPTOOL_MODE_DEFINEBYQUERY, definebyqueryMode); + MODECASE(CHIPTOOL_MODE_DEFINEBYQUERY, definebyqueryMode); MODECASE(CHIPTOOL_MODE_UPDATERUN, updaterunMode); MODECASE(CHIPTOOL_MODE_PENDINGIMFILE, pendingimfileMode); @@ -78,6 +80,8 @@ MODECASE(CHIPTOOL_MODE_UNMASKED, unmaskedMode); MODECASE(CHIPTOOL_MODE_UNBLOCK, unblockMode); - MODECASE(CHIPTOOL_MODE_PENDINGCLEANUP, pendingcleanupMode); + MODECASE(CHIPTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunMode); + MODECASE(CHIPTOOL_MODE_PENDINGCLEANUPIMFILE, pendingcleanupimfileMode); MODECASE(CHIPTOOL_MODE_DONECLEANUP, donecleanupMode); + MODECASE(CHIPTOOL_MODE_RUN, runMode); default: psAbort("invalid option (this should not happen)"); @@ -835,5 +839,5 @@ -static bool pendingcleanupMode(pxConfig *config) +static bool pendingcleanuprunMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); @@ -845,5 +849,5 @@ PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); - psString query = pxDataGet("chiptool_pendingcleanup.sql"); + psString query = pxDataGet("chiptool_pendingcleanuprun.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); @@ -884,5 +888,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "chipPendingCleanup", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "chipPendingCleanupRun", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -896,15 +900,19 @@ -static bool donecleanupMode(pxConfig *config) +static bool pendingcleanupimfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, NULL); + PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psMetadata *where = psMetadataAlloc(); + if (chip_id) { + PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + } PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); - psString query = pxDataGet("chiptool_donecleanup.sql"); + psString query = pxDataGet("chiptool_pendingcleanupimfile.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); @@ -945,4 +953,134 @@ // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "chipPendingCleanupImfile", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} + + +static bool donecleanupMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + + psString query = pxDataGet("chiptool_donecleanup.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + // treat limit == 0 as "no limit" + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("chiptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "chipDoneCleanup", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} + + +static bool runMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + + PXOPT_LOOKUP_STR(state, config->args, "-state", true, false); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + // make sure that the state string is valid + if (!pxIsValidState(state)) { + psError(PXTOOLS_ERR_DATA, false, "%s is not a valid state", state); + return false; + } + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); + PXOPT_COPY_STR(config->args, where, "-state", "state", "=="); + + psString query = pxDataGet("chiptool_run.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereSQL(where, NULL); + psStringAppend(&query, " %s", whereClause); + psFree(whereClause); + } + psFree(where); + + // treat limit == 0 as "no limit" + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("chiptool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + // negative simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "chipDoneCleanup", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); @@ -992,5 +1130,5 @@ chipRunRow *chipRun = chipRunObjectFromMetadata(row); // set chipRun.state to 'stop' - if (!pxchipRunSetState(config, chipRun->chip_id, "stop")) { + if (!pxchipRunSetState(config, chipRun->chip_id, "full")) { psError(PS_ERR_UNKNOWN, false, "failed to change chipRun.state for chip_id: %" PRId64, chipRun->chip_id); psFree(chipRun); Index: /trunk/ippTools/src/chiptool.h =================================================================== --- /trunk/ippTools/src/chiptool.h (revision 18365) +++ /trunk/ippTools/src/chiptool.h (revision 18366) @@ -37,6 +37,8 @@ CHIPTOOL_MODE_UNBLOCK, CHIPTOOL_MODE_RETRYPROCESSEDIMFILE, - CHIPTOOL_MODE_PENDINGCLEANUP, + CHIPTOOL_MODE_PENDINGCLEANUPRUN, + CHIPTOOL_MODE_PENDINGCLEANUPIMFILE, CHIPTOOL_MODE_DONECLEANUP, + CHIPTOOL_MODE_RUN } chiptoolMode; Index: /trunk/ippTools/src/chiptoolConfig.c =================================================================== --- /trunk/ippTools/src/chiptoolConfig.c (revision 18365) +++ /trunk/ippTools/src/chiptoolConfig.c (revision 18366) @@ -45,56 +45,56 @@ // -definebyquery - psMetadata *queueArgs = psMetadataAlloc(); + psMetadata *definebyqueryArgs = psMetadataAlloc(); + // XXX need to allow multiple exp_ids - psMetadataAddS64(queueArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); - psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); - psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", "object"); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); - psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); - - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_tess_id", 0, "define tessellation identifier", NULL); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_end_stage", 0, "define end stage", NULL); - psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-pretend", 0, "do not actually modify the database", false); - psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); - + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", "object"); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); + + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_expgroup", 0, "define exposure group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_tess_id", 0, "define tessellation identifier", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_end_stage", 0, "define end stage", NULL); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "do not actually modify the database", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); // -updaterun @@ -273,9 +273,18 @@ psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to unmask (required)", NULL); - // -pendingcleanup - psMetadata *pendingcleanupArgs = psMetadataAlloc(); - psMetadataAddStr(pendingcleanupArgs, PS_LIST_TAIL, "-label", 0, "list blocks for specified label", NULL); - psMetadataAddBool(pendingcleanupArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddU64(pendingcleanupArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + // -pendingcleanuprun + psMetadata *pendingcleanuprunArgs = psMetadataAlloc(); + psMetadataAddStr(pendingcleanuprunArgs, PS_LIST_TAIL, "-label", 0, "list blocks for specified label", NULL); + psMetadataAddBool(pendingcleanuprunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanuprunArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + // -pendingcleanupifmile + psMetadata *pendingcleanupimfileArgs = psMetadataAlloc(); + psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-label", 0, "list blocks for specified label", NULL); + psMetadataAddS64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-chip_id", 0, + "search by chip ID", 0); + psMetadataAddStr(pendingcleanupimfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", NULL); + psMetadataAddBool(pendingcleanupimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(pendingcleanupimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -doneclenaup @@ -285,9 +294,16 @@ psMetadataAddU64(donecleanupArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + // -run + psMetadata *runArgs = psMetadataAlloc(); + psMetadataAddStr(runArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL); + psMetadataAddBool(runArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(runArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddStr(runArgs, PS_LIST_TAIL, "-state", 0, "search by state (required)", NULL); + psMetadata *argSets = psMetadataAlloc(); psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-definebyquery", "create runs from raw exposures", - CHIPTOOL_MODE_DEFINEBYQUERY, queueArgs); + PXOPT_ADD_MODE("-definebyquery", "create runs from raw exposures", + CHIPTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); PXOPT_ADD_MODE("-updaterun", "change chip run properties", CHIPTOOL_MODE_UPDATERUN, updaterunArgs); @@ -310,8 +326,12 @@ PXOPT_ADD_MODE("-unblock", "remove a label block", CHIPTOOL_MODE_UNBLOCK, unblockArgs); - PXOPT_ADD_MODE("-pendingcleanup", "show runs that need to be cleaned up", - CHIPTOOL_MODE_PENDINGCLEANUP, pendingcleanupArgs); + PXOPT_ADD_MODE("-pendingcleanuprun", "show runs that need to be cleaned up", + CHIPTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunArgs); + PXOPT_ADD_MODE("-pendingcleanupimfile", "show runs that need to be cleaned up", + CHIPTOOL_MODE_PENDINGCLEANUPIMFILE, pendingcleanupimfileArgs); PXOPT_ADD_MODE("-donecleanup", "show runs that have been cleaned", CHIPTOOL_MODE_DONECLEANUP, donecleanupArgs); + PXOPT_ADD_MODE("-run", "show runs", + CHIPTOOL_MODE_RUN, runArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { Index: /trunk/ippTools/src/faketoolConfig.c =================================================================== --- /trunk/ippTools/src/faketoolConfig.c (revision 18365) +++ /trunk/ippTools/src/faketoolConfig.c (revision 18366) @@ -231,4 +231,14 @@ "allow everything to be queued without search terms", false); + // -pendingexp + psMetadata *pendingexpArgs = psMetadataAlloc(); + psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0, + "search by camtool ID", 0); + psMetadataAddS64(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0, + "search by chiptool ID", 0); + psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit", 0, + "limit result set to N items", 0); + psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); // -pendingexp Index: /trunk/ippTools/src/pxchip.c =================================================================== --- /trunk/ippTools/src/pxchip.c (revision 18365) +++ /trunk/ippTools/src/pxchip.c (revision 18366) @@ -35,12 +35,6 @@ // check that state is a valid string value - if (!( - (strncmp(state, "run", 4) == 0) - || (strncmp(state, "stop", 5) == 0) - || (strncmp(state, "reg", 4) == 0) - ) - ) { - psError(PS_ERR_UNKNOWN, false, - "invalid chipRun state: %s", state); + if (!pxIsValidState(state)) { + psError(PS_ERR_UNKNOWN, false, "invalid chipRun state: %s", state); return false; } @@ -63,14 +57,9 @@ // check that state is a valid string value - if (!( - (strncmp(state, "run", 4) == 0) - || (strncmp(state, "stop", 5) == 0) - || (strncmp(state, "reg", 4) == 0) - ) - ) { - psError(PS_ERR_UNKNOWN, false, - "invalid chipRun state: %s", state); + if (!pxIsValidState(state)) { + psError(PS_ERR_UNKNOWN, false, "invalid chipRun state: %s", state); return false; } + psString query = psStringCopy("UPDATE chipRun JOIN rawExp USING(exp_id) SET state = '%s'"); @@ -151,5 +140,5 @@ 0x0, // chip_id exp_id, - "run", // state + "new", // state workdir, "dirty", // workdir_state @@ -167,2 +156,3 @@ return psDBLastInsertID(config->dbh); } + Index: /trunk/ippTools/src/pxchip.h =================================================================== --- /trunk/ippTools/src/pxchip.h (revision 18365) +++ /trunk/ippTools/src/pxchip.h (revision 18366) @@ -40,3 +40,4 @@ const char *end_stage); + #endif // PXCHIP_H Index: /trunk/ippTools/src/pxtools.h =================================================================== --- /trunk/ippTools/src/pxtools.h (revision 18365) +++ /trunk/ippTools/src/pxtools.h (revision 18366) @@ -43,6 +43,5 @@ # define PXTOOL_MODE_NONE 0x0 -bool pxCreateTables (pxConfig *config); -bool pxDeleteTables (pxConfig *config); +bool pxIsValidState(const char *state); bool pxSetFaultCode(psDB *dbh, const char *tableName, psMetadata *where, psS16 code);