Index: /branches/faketool/ippTools/scripts/regtest.sh =================================================================== --- /branches/faketool/ippTools/scripts/regtest.sh (revision 17956) +++ /branches/faketool/ippTools/scripts/regtest.sh (revision 17957) @@ -33,5 +33,5 @@ $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 $regtool -pendingimfile || exit 1 @@ -43,3 +43,3 @@ $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 Index: /branches/faketool/ippTools/share/Makefile.am =================================================================== --- /branches/faketool/ippTools/share/Makefile.am (revision 17956) +++ /branches/faketool/ippTools/share/Makefile.am (revision 17957) @@ -1,7 +1,7 @@ dist_pkgdata_DATA = \ + camtool_find_chip_id.sql \ camtool_find_pendingexp.sql \ camtool_find_pendingimfile.sql \ camtool_find_processedexp.sql \ - camtool_find_chip_id.sql \ camtool_queue_chip_id.sql \ camtool_reset_faulted_runs.sql \ @@ -18,15 +18,7 @@ detselect_search.sql \ detselect_select.sql \ - faketool_completely_processed_exp.sql \ - faketool_pendingimfile.sql \ - faketool_processedimfile.sql \ - faketool_queue_cam_id.sql \ - dettool_tocorrectimfile.sql \ - dettool_tocorrectexp.sql \ - dettool_stop_completed_correct_runs.sql \ dettool_find_completed_runs.sql \ dettool_normalizedstat.sql \ dettool_raw.sql \ - dettool_runs.sql \ dettool_revertdetrunsummary.sql \ dettool_revertnormalizedexp.sql \ @@ -38,5 +30,9 @@ dettool_revertresidimfile.sql\ dettool_revertstacked.sql \ + dettool_runs.sql \ dettool_start_new_iteration.sql \ + dettool_stop_completed_correct_runs.sql \ + dettool_tocorrectexp.sql \ + dettool_tocorrectimfile.sql \ dettool_todetrunsummary.sql \ dettool_tonormalizedexp.sql \ @@ -48,24 +44,32 @@ dettool_tostacked.sql \ difftool_inputskyfile.sql \ + difftool_queue.sql \ + difftool_revertdiffskyfile.sql \ difftool_skyfile.sql \ difftool_todiffskyfile.sql \ - difftool_revertdiffskyfile.sql \ - difftool_queue.sql \ + faketool_completely_processed_exp.sql \ + faketool_find_camrun.sql \ + faketool_find_pendingexp.sql \ + faketool_pendingimfile.sql \ + faketool_processedimfile.sql \ + faketool_queue_cam_id.sql \ + faketool_revertprocessedimfile.sql \ + faketool_unmasked.sql \ + flatcorr_completely_processed_chiprun.sql \ flatcorr_create_tmp_chiprundone.sql \ - flatcorr_completely_processed_chiprun.sql \ flatcorr_find_completed_floatcorruns.sql \ flatcorr_find_processedimfiles.sql \ - magictool_toprocess_inputs.sql \ - magictool_toprocess_tree.sql \ - magictool_tomask.sql \ - magictool_toskyfilemask.sql \ magictool_find_complete_diffed_exposures.sql \ magictool_find_complete_warpruns.sql \ magictool_inputskyfile.sql \ + magictool_tomask.sql \ + magictool_toprocess_inputs.sql \ + magictool_toprocess_tree.sql \ + magictool_toskyfilemask.sql \ + pxadmin_create_tables.sql \ + pxadmin_drop_tables.sql \ pztool_find_completed_exp.sql \ pztool_pendingimfile.sql \ pztool_revertcopied.sql \ - pxadmin_create_tables.sql \ - pxadmin_drop_tables.sql \ regtool_pendingexp.sql \ regtool_pendingimfile.sql \ @@ -83,5 +87,5 @@ warptool_scmap.sql \ warptool_tooverlap.sql \ + warptool_revertwarped.sql \ warptool_towarped.sql \ - warptool_warped.sql \ - warptool_revertwarped.sql + warptool_warped.sql Index: /branches/faketool/ippTools/share/faketool_find_camrun.sql =================================================================== --- /branches/faketool/ippTools/share/faketool_find_camrun.sql (revision 17957) +++ /branches/faketool/ippTools/share/faketool_find_camrun.sql (revision 17957) @@ -0,0 +1,36 @@ +SELECT + * +FROM + (SELECT DISTINCT + camRun.cam_id, + chipRun.*, + rawExp.camera, + rawExp.telescope, + rawExp.dateobs, + rawExp.exp_tag, + rawExp.exp_type, + rawExp.filelevel, + rawExp.filter, + rawExp.airmass, + rawExp.ra, + rawExp.decl, + rawExp.exp_time, + rawExp.sat_pixel_frac, + rawExp.bg, + rawExp.bg_stdev, + rawExp.bg_mean_stdev, + rawExp.alt, + rawExp.az, + rawExp.ccd_temp, + rawExp.posang, + rawExp.object, + rawExp.solang + FROM camRun + JOIN chipRun + using(chip_id) + JOIN rawExp + using(exp_id) + WHERE + camRun.state = 'stop' + AND chipRun.state = 'stop' +) as Foo Index: /branches/faketool/ippTools/share/faketool_find_pendingexp.sql =================================================================== --- /branches/faketool/ippTools/share/faketool_find_pendingexp.sql (revision 17957) +++ /branches/faketool/ippTools/share/faketool_find_pendingexp.sql (revision 17957) @@ -0,0 +1,34 @@ +-- this query is used by both camtool -pendingexp & camtool -addprocessedexp it +-- does a little more work then is necessary for -addprocessed but it seems +-- "cleaner" to use the same query for both cases +SELECT * FROM + (SELECT + fakeRun.*, + rawExp.exp_tag, + rawExp.exp_id, + rawExp.exp_name, + rawExp.camera, + rawExp.telescope, + rawExp.filelevel + FROM fakeRun + JOIN camRun + USING(cam_id) + JOIN chipRun + USING(chip_id) + JOIN chipProcessedImfile + USING(chip_id) + JOIN rawExp + ON chipRun.exp_id = rawExp.exp_id + LEFT JOIN fakeProcessedImfile + USING(fake_id) + LEFT JOIN fakeMask + ON fakeRun.label = fakeMask.label + WHERE + fakeRun.state = 'run' + AND camRun.state = 'stop' + AND chipRun.state = 'stop' + AND fakeMask.label IS NULL + AND fakeProcessedImfile.fake_id IS NULL + GROUP BY + fakeRun.fake_id + ) as Foo Index: /branches/faketool/ippTools/share/faketool_revertprocessedimfile.sql =================================================================== --- /branches/faketool/ippTools/share/faketool_revertprocessedimfile.sql (revision 17957) +++ /branches/faketool/ippTools/share/faketool_revertprocessedimfile.sql (revision 17957) @@ -0,0 +1,8 @@ +DELETE FROM fakeProcessedImfile +USING fakeProcessedImfile, fakeRun, camRun, chipRun, rawExp +WHERE + fakeProcessedImfile.fake_id = fakeRun.fake_id + AND fakeRun.cam_id = camRun.cam_id + AND camRun.chip_id = chipRun.chip_id + AND chipRun.exp_id = rawExp.exp_id + AND fakeProcessedImfile.fault != 0 Index: /branches/faketool/ippTools/share/faketool_unmasked.sql =================================================================== --- /branches/faketool/ippTools/share/faketool_unmasked.sql (revision 17957) +++ /branches/faketool/ippTools/share/faketool_unmasked.sql (revision 17957) @@ -0,0 +1,11 @@ +SELECT + * +FROM + (SELECT + fakeRun.label, + count(fakeRun.fake_id) as n_fakeruns + FROM fakeRun + LEFT JOIN fakeMask + USING (label) + WHERE fakeMask.label IS NULL + GROUP BY fakeRun.label) as fakeUnmask Index: /branches/faketool/ippTools/src/faketool.c =================================================================== --- /branches/faketool/ippTools/src/faketool.c (revision 17956) +++ /branches/faketool/ippTools/src/faketool.c (revision 17957) @@ -35,4 +35,5 @@ static bool queueMode(pxConfig *config); static bool updaterunMode(pxConfig *config); +static bool pendingexpMode(pxConfig *config); static bool pendingimfileMode(pxConfig *config); static bool addprocessedimfileMode(pxConfig *config); @@ -66,4 +67,5 @@ MODECASE(FAKETOOL_MODE_QUEUE, queueMode); MODECASE(FAKETOOL_MODE_UPDATERUN, updaterunMode); + MODECASE(FAKETOOL_MODE_PENDINGEXP, pendingexpMode); MODECASE(FAKETOOL_MODE_PENDINGIMFILE, pendingimfileMode); MODECASE(FAKETOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); @@ -178,6 +180,6 @@ if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, "camRun"); - psStringAppend(&query, " AND %s", whereClause); + psString whereClause = psDBGenerateWhereSQL(where, NULL); + psStringAppend(&query, " %s", whereClause); psFree(whereClause); } @@ -353,4 +355,74 @@ +static bool pendingexpMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + 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, "-fake_id", "fake_id", "=="); + PXOPT_COPY_STR(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_STR(config->args, where, "-chip_id", "chip_id", "=="); + + psString query = pxDataGet("faketool_find_pendingexp.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); + 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("camtool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (!convertIdToStr(output)) { + psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings"); + psFree(output); + return false; + } + + // negate simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "fakePendingExp", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + + return true; +} + + static bool pendingimfileMode(pxConfig *config) { @@ -705,8 +777,22 @@ PXOPT_LOOKUP_S16(code, config->args, "-code", true, false); - if (!pxSetFaultCode(config->dbh, "fakeProcessedImfile", config->where, code)) { + psMetadata *where = psMetadataAlloc(); + PXOPT_LOOKUP_STR(fake_id, config->args, "-fake_id", false, false); + // convert fake_id into a psS64 + if (fake_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "fake_id", 0, "==", (psS64)atoll(fake_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item fake_id"); + psFree(where); + return false; + } + } + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + + if (!pxSetFaultCode(config->dbh, "fakeProcessedImfile", where, code)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); - return false; - } + psFree(where); + return false; + } + psFree(where); return true; Index: /branches/faketool/ippTools/src/faketool.h =================================================================== --- /branches/faketool/ippTools/src/faketool.h (revision 17956) +++ /branches/faketool/ippTools/src/faketool.h (revision 17957) @@ -28,4 +28,5 @@ FAKETOOL_MODE_UPDATERUN, FAKETOOL_MODE_PENDINGIMFILE, + FAKETOOL_MODE_PENDINGEXP, FAKETOOL_MODE_ADDPROCESSEDIMFILE, FAKETOOL_MODE_PROCESSEDIMFILE, Index: /branches/faketool/ippTools/src/faketoolConfig.c =================================================================== --- /branches/faketool/ippTools/src/faketoolConfig.c (revision 17956) +++ /branches/faketool/ippTools/src/faketoolConfig.c (revision 17957) @@ -232,4 +232,15 @@ + // -pendingexp + psMetadata *pendingexpArgs = psMetadataAlloc(); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-cam_id", 0, + "search by camtool ID", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-chip_id", 0, + "search by chiptool ID", NULL); + 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); + // -pendingimfile psMetadata *pendingimfileArgs = psMetadataAlloc(); @@ -416,15 +427,18 @@ PXOPT_ADD_MODE("-queue", "create runs from raw exposures", - FAKETOOL_MODE_QUEUE, queueArgs); + FAKETOOL_MODE_QUEUE, queueArgs); PXOPT_ADD_MODE("-updaterun", "change fake run properties", - FAKETOOL_MODE_UPDATERUN, updaterunArgs); + FAKETOOL_MODE_UPDATERUN, updaterunArgs); + PXOPT_ADD_MODE("-pendingexp", "show pending exposures", + FAKETOOL_MODE_PENDINGEXP, pendingexpArgs); PXOPT_ADD_MODE("-pendingimfile", "show pending imfiles", - FAKETOOL_MODE_PENDINGIMFILE, pendingimfileArgs); + FAKETOOL_MODE_PENDINGIMFILE, pendingimfileArgs); PXOPT_ADD_MODE("-addprocessedimfile", "add a processed imfile", - FAKETOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs); + FAKETOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs); PXOPT_ADD_MODE("-processedimfile", "show processed imfiles", - FAKETOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); - PXOPT_ADD_MODE("-updateprocessedimfile", "change procesed imfile properties", FAKETOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); - PXOPT_ADD_MODE("-revertprocessedimfile", "undo a processed imfile", FAKETOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileArgs); + FAKETOOL_MODE_PROCESSEDIMFILE, processedimfileArgs); + PXOPT_ADD_MODE("-updateprocessedimfile","change procesed imfile properties", FAKETOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs); + PXOPT_ADD_MODE("-revertprocessedimfile", "undo a processed imfile", + FAKETOOL_MODE_REVERTPROCESSEDIMFILE, revertprocessedimfileArgs); PXOPT_ADD_MODE("-block", "set a label block", FAKETOOL_MODE_BLOCK, blockArgs); PXOPT_ADD_MODE("-masked", "show blocked labels", FAKETOOL_MODE_MASKED, maskedArgs);