Index: branches/simmosaic_branches/ippTools/src/camtool.c =================================================================== --- branches/simmosaic_branches/ippTools/src/camtool.c (revision 24860) +++ branches/simmosaic_branches/ippTools/src/camtool.c (revision 27839) @@ -109,11 +109,11 @@ psMetadata *where = psMetadataAlloc(); pxcamGetSearchArgs (config, where); - pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); + pxAddLabelSearchArgs (config, where, "-label", "chipRun.label", "=="); // define using chipRun label + PXOPT_COPY_STR(config->args, where, "-reduction", "chipRun.reduction", "=="); if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); return false; } @@ -121,4 +121,6 @@ PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false); + PXOPT_LOOKUP_STR(dist_group, config->args, "-set_dist_group", false, false); PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", false, false); @@ -126,9 +128,10 @@ PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false); PXOPT_LOOKUP_STR(end_stage, config->args, "-set_end_stage", false, false); + PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); // find the exp_id of all the exposures that we want to queue up. psString query = pxDataGet("camtool_find_chip_id.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); psFree(where); return false; @@ -181,8 +184,8 @@ bool status; char *end_stage = psMetadataLookupStr(&status, md, "end_stage"); - if (end_stage && strcasecmp(end_stage, "warp")) continue; + if (end_stage && strcasecmp(end_stage, "warp")) continue; char *raw_tess_id = psMetadataLookupStr(&status, md, "tess_id"); - if (raw_tess_id || tess_id) continue; + if (raw_tess_id || tess_id) continue; char *label = psMetadataLookupStr(&status, md, "label"); @@ -190,5 +193,5 @@ if (!status) { - psError(PS_ERR_UNKNOWN, false, "cannot queue analysis to WARP without a defined tess id: label: %s, exp_id %" PRId64, label, exp_id); + psError(PS_ERR_UNKNOWN, false, "cannot queue analysis to WARP without a defined tess id: label: %s, exp_id %" PRId64, label, exp_id); psFree(output); return false; @@ -196,11 +199,11 @@ } - // loop over our list of camRun rows + // loop over our list of chipRun rows for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - camRunRow *row = camRunObjectFromMetadata(md); + chipRunRow *row = chipRunObjectFromMetadata(md); if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into chipRun"); psFree(output); return false; @@ -212,9 +215,13 @@ workdir ? workdir : row->workdir, label ? label : row->label, + data_group ? data_group: row->data_group, + dist_group ? dist_group: row->dist_group, reduction ? reduction : row->reduction, expgroup ? expgroup : row->expgroup, dvodb ? dvodb : row->dvodb, tess_id ? tess_id : row->tess_id, - end_stage ? end_stage : row->end_stage + end_stage ? end_stage : row->end_stage, + row->magicked, + note )) { if (!psDBRollback(config->dbh)) { @@ -248,42 +255,25 @@ PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "=="); + PXOPT_COPY_STR(config->args, where, "-data_group","camRun.data_group", "=="); PXOPT_COPY_STR(config->args, where, "-state", "camRun.state", "=="); PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); - if (!psListLength(where->list) - && !psMetadataLookupBool(NULL, config->args, "-all")) { + if (!psListLength(where->list)) { psFree(where); - psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); - return false; - } - - PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); - PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); - - if ((!state) && (!label)) { - psError(PXTOOLS_ERR_DATA, false, "parameters are required"); - psFree(where); - return false; - } - - if (state) { - // set camRun.state to state - if (!pxcamRunSetStateByQuery(config, where, state)) { - psFree(where); - return false; - } - } - - if (label) { - // set camRun.label to label - if (!pxcamRunSetLabelByQuery(config, where, label)) { - psFree(where); - return false; - } - } - + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; + } + psString query = psStringCopy("UPDATE camRun JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)"); + + // pxUpdateRun gets parameters from config->args and updates + bool result = pxUpdateRun(config, where, &query, "camRun", "cam_id", "camProcessedExp", true); + if (!result) { + psError(psErrorCodeLast(), false, "pxUpdateRun failed"); + } + + psFree(query); psFree(where); - return true; + return result; } @@ -304,5 +294,5 @@ psString query = pxDataGet("camtool_find_pendingexp.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -369,5 +359,5 @@ psString query = pxDataGet("camtool_find_pendingimfile.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -491,6 +481,7 @@ PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false); - - PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false); + +// Get this from the chipRun +// PXOPT_LOOKUP_S64(magicked, config->args, "-magicked", false, false); // generate restrictions @@ -500,5 +491,5 @@ psString query = pxDataGet("camtool_find_pendingexp.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -535,4 +526,7 @@ return false; } + + bool status; + psS64 chip_magicked = psMetadataLookupS64(&status, output->data[0], "chip_magicked"); camRunRow *pendingRow = camRunObjectFromMetadata(output->data[0]); @@ -615,16 +609,5 @@ } - // since there is only one exp per 'new' set camRun.state = 'full' - if (!pxcamRunSetState(config, row->cam_id, "full", magicked)) { - psError(PS_ERR_UNKNOWN, false, "failed to change camRun.state for cam_id: %" PRId64, row->cam_id); - psFree(row); - psFree(pendingRow); - return false; - } - - // NULL for end_stage means go as far as possible - // EAM : skip here if fault != 0 - // Also, we can run fake even if tess_id is not defined - if (fault || (pendingRow->end_stage && psStrcasestr(pendingRow->end_stage, "cam"))) { + if (fault) { psFree(row); psFree(pendingRow); @@ -635,6 +618,26 @@ return true; } + // else continue on... + + // since there is only one exp per 'new' set camRun.state = 'full' + // propagate magicked state from chipRun + if (!pxcamRunSetState(config, row->cam_id, "full", chip_magicked)) { + psError(PS_ERR_UNKNOWN, false, "failed to change camRun.state for cam_id: %" PRId64, row->cam_id); + psFree(row); + psFree(pendingRow); + return false; + } psFree(row); - // else continue on... + + // EAM: NULL for end_stage means go as far as possible + // Also, we can run fake even if tess_id is not defined + if (pendingRow->end_stage && psStrcasestr(pendingRow->end_stage, "cam")) { + psFree(pendingRow); + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + return true; + } if (!pxfakeQueueByCamID(config, @@ -642,9 +645,12 @@ pendingRow->workdir, pendingRow->label, + pendingRow->data_group, + pendingRow->dist_group, pendingRow->reduction, pendingRow->expgroup, pendingRow->dvodb, pendingRow->tess_id, - pendingRow->end_stage + pendingRow->end_stage, + NULL // note does not propagate )) { // rollback @@ -656,4 +662,5 @@ return false; } + psFree(pendingRow); @@ -674,4 +681,5 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); + PXOPT_LOOKUP_BOOL(pstamp_order, config->args, "-pstamp_order", false); // generate restrictions @@ -680,10 +688,20 @@ PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); + pxAddLabelSearchArgs (config, where, "-data_group", "camRun.data_group", "LIKE"); PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); - if (!psListLength(where->list) && + psString where2 = NULL; + if (!pxspaceAddWhere(config, &where2, "rawExp")) { + psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed"); + return false; + } + if (!pxmagicAddWhere(config, &where2, "chipRun")) { + psError(psErrorCodeLast(), false, "pxSpaceAddWhere failed"); + return false; + } + if (!psListLength(where->list) && !where2 && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - psError(PXTOOLS_ERR_DATA, false, "search parameters (or -all) are required"); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters (or -all) are required"); return false; } @@ -691,5 +709,5 @@ psString query = pxDataGet("camtool_find_processedexp.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -699,5 +717,5 @@ psStringAppend(&query, " WHERE %s", whereClause); psFree(whereClause); - } + } // we either add AND (condition) or WHERE (condition): @@ -705,5 +723,5 @@ // list only faulted rows psStringAppend(&query, " %s", " AND camProcessedExp.fault != 0"); - } + } if (where->list && !faulted) { // don't list faulted rows @@ -713,5 +731,5 @@ // list only faulted rows psStringAppend(&query, " %s", " WHERE camProcessedExp.fault != 0"); - } + } if (!where->list && !faulted) { // don't list faulted rows @@ -719,7 +737,15 @@ } psFree(where); - - // order by cam_id so that the postage stamp parser can easliy find the 'latest' astrometry - psStringAppend(&query, " ORDER BY cam_id"); + if (where2) { + psStringAppend(&query, " %s", where2); + psFree(where2); + } + + + if (pstamp_order) { + // put runs in order of exposure id with newest chip Runs first + // The postage stamp parser depends on this behavior + psStringAppend(&query, " ORDER BY exp_id, cam_id DESC"); + } // treat limit == 0 as "no limit" @@ -774,5 +800,5 @@ if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); return false; } @@ -787,5 +813,5 @@ psString query = pxDataGet("camtool_reset_faulted_runs.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); psFree(where); return false; @@ -819,5 +845,5 @@ psError(PS_ERR_UNKNOWN, false, "database error"); } - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); psFree(where); return false; @@ -959,5 +985,5 @@ psString query = pxDataGet("camtool_pendingcleanuprun.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -1024,5 +1050,5 @@ psString query = pxDataGet("camtool_pendingcleanupexp.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -1085,5 +1111,5 @@ psString query = pxDataGet("camtool_donecleanup.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -1155,4 +1181,9 @@ } + if (!pxExportVersion(config, f)) { + psError(PS_ERR_UNKNOWN, false, "failed to write dbversion output file"); + return false; + } + psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); @@ -1166,5 +1197,5 @@ psString query = pxDataGet(tables[i].sqlFilename); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } @@ -1235,6 +1266,13 @@ psMetadata *input = psMetadataConfigRead (NULL, &nFail, infile, false); - fprintf (stdout, "---- input ----\n"); +#ifdef notdef + fprintf (stderr, "---- input ----\n"); psMetadataPrint (stderr, input, 1); +#endif + + if (!pxCheckImportVersion(config, input)) { + psError(PS_ERR_UNKNOWN, false, "pxCheckImportVersion failed"); + return false; + } psMetadataItem *item = psMetadataLookup (input, "camRun");