Index: /branches/eam_branch_20080706/ippTools/notes.txt =================================================================== --- /branches/eam_branch_20080706/ippTools/notes.txt (revision 18490) +++ /branches/eam_branch_20080706/ippTools/notes.txt (revision 18491) @@ -1,2 +1,9 @@ + +2008.07.11 EAM + + * break dettool.c into files for each detrend stage + * require -iteration in more places? (esp -add...) + * allow %s, %d arguments in the *.sql files or not? + * adddetrunsummary has the ability to set values for multiple detRunSummary entries. why? 2008.07.09 EAM Index: /branches/eam_branch_20080706/ippTools/share/dettool_detrunsummary.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_detrunsummary.sql (revision 18491) +++ /branches/eam_branch_20080706/ippTools/share/dettool_detrunsummary.sql (revision 18491) @@ -0,0 +1,9 @@ +SELECT DISTINCT + detRunSummary.*, + detRun.det_type, + detRun.mode + FROM detRun + JOIN detRunSummary + USING(det_id, iteration) + WHERE + detRun.state = 'run' Index: /branches/eam_branch_20080706/ippTools/share/dettool_normalizedexp.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_normalizedexp.sql (revision 18491) +++ /branches/eam_branch_20080706/ippTools/share/dettool_normalizedexp.sql (revision 18491) @@ -0,0 +1,8 @@ +SELECT + detNormalizedExp.* + FROM detNormalizedExp + JOIN detRun + USING(det_id, iteration) + WHERE + detRun.state = 'run' + AND detRun.mode = 'master' Index: /branches/eam_branch_20080706/ippTools/share/dettool_residexp.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_residexp.sql (revision 18491) +++ /branches/eam_branch_20080706/ippTools/share/dettool_residexp.sql (revision 18491) @@ -0,0 +1,11 @@ +SELECT + detRun.mode, + detResidExp.*, + detInputExp.include + FROM detRun + JOIN detInputExp + USING(det_id, iteration) + JOIN detResidExp + USING(det_id, iteration, exp_id) + WHERE + detRun.state = 'run' Index: /branches/eam_branch_20080706/ippTools/share/dettool_residimfile.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_residimfile.sql (revision 18491) +++ /branches/eam_branch_20080706/ippTools/share/dettool_residimfile.sql (revision 18491) @@ -0,0 +1,11 @@ +SELECT + detRun.det_type, + detRun.mode, + detResidImfile.*, + rawExp.exp_time + FROM detResidImfile + JOIN detRun + USING(det_id, iteration) + JOIN rawExp + USING(exp_id) + WHERE Index: /branches/eam_branch_20080706/ippTools/share/dettool_tonormalizedexp.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_tonormalizedexp.sql (revision 18490) +++ /branches/eam_branch_20080706/ippTools/share/dettool_tonormalizedexp.sql (revision 18491) @@ -1,2 +1,4 @@ +-- this is used by both 'tonormalizedexp' and 'addnormalizedexp' + SELECT * Index: /branches/eam_branch_20080706/ippTools/share/dettool_toresidexp.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/dettool_toresidexp.sql (revision 18490) +++ /branches/eam_branch_20080706/ippTools/share/dettool_toresidexp.sql (revision 18491) @@ -1,2 +1,4 @@ +-- this is used by both 'toresidexp' and 'addresidexp' + -- which returns a list of exposures for which all component class ids have had -- residuals created. This list includes the detrend id, iteration, exposure Index: /branches/eam_branch_20080706/ippTools/share/difftool_queue.sql =================================================================== --- /branches/eam_branch_20080706/ippTools/share/difftool_queue.sql (revision 18490) +++ /branches/eam_branch_20080706/ippTools/share/difftool_queue.sql (revision 18491) @@ -3,4 +3,5 @@ stackRun.tess_id, stackRun.stack_id, + diffInputSkyfile.template, warpSkyfile.warp_id FROM stackSumSkyfile Index: /branches/eam_branch_20080706/ippTools/src/caltool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/caltool.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/caltool.c (revision 18491) @@ -110,10 +110,4 @@ psString query = psStringCopy("SELECT * FROM calDB"); - - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, NULL); - psStringAppend(&query, " %s", whereClause); - psFree(whereClause); - } // treat limit == 0 as "no limit" @@ -195,19 +189,32 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-cal_id", "cal_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-simple", false); psString query = psStringCopy("SELECT * FROM calRun"); - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, NULL); + if (faulted) { + // list only faulted rows + psStringAppend(&query, " %s", "WHERE fault != 0"); + } else { + // don't list faulted rows + psStringAppend(&query, " %s", "WHERE fault = 0"); + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(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); + psStringAppend(&query, " AND %s", limitString); psFree(limitString); } Index: /branches/eam_branch_20080706/ippTools/src/caltoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/caltoolConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/caltoolConfig.c (revision 18491) @@ -49,35 +49,24 @@ // -adddb psMetadata *adddbArgs = psMetadataAlloc(); - psMetadataAddStr(adddbArgs, PS_LIST_TAIL, "-dvodb", 0, - "define DVO db (required)", NULL); + psMetadataAddStr(adddbArgs, PS_LIST_TAIL, "-dvodb", 0, "define DVO db (required)", NULL); // -dbs psMetadata *dbsArgs = psMetadataAlloc(); - psMetadataAddU64(dbsArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(dbsArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddU64(dbsArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(dbsArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addrun psMetadata *addrunArgs = psMetadataAlloc(); - psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-cal_id", 0, - "define calibration DB ID (required)", NULL); - psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-region", 0, - "define region (required)", NULL); - psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-last_step", 0, - "define last step (required)", NULL); - psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-state", 0, - "define state (required)", NULL); + psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-cal_id", 0, "define calibration DB ID (required)", NULL); + psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-region", 0, "define region (required)", NULL); + psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-last_step", 0, "define last step (required)", NULL); + psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-state", 0, "define state (required)", NULL); // -runs psMetadata *runsArgs = psMetadataAlloc(); - psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-cal_id", 0, - "search for calibration ID", NULL); - psMetadataAddU64(runsArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-cal_id", 0, "search for calibration ID", NULL); + psMetadataAddU64(runsArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); psFree(now); @@ -86,12 +75,8 @@ psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-adddb", "add a DVO calibration DB", - CALTOOL_MODE_ADDDB, adddbArgs); - PXOPT_ADD_MODE("-dbs", "list DVO calibration DBs", - CALTOOL_MODE_DBS, dbsArgs); - PXOPT_ADD_MODE("-addrun", "add the results of a calibration run", - CALTOOL_MODE_ADDRUN, addrunArgs); - PXOPT_ADD_MODE("-runs", "list the results of calibration runs", - CALTOOL_MODE_RUNS, runsArgs); + PXOPT_ADD_MODE("-adddb", "add a DVO calibration DB", CALTOOL_MODE_ADDDB, adddbArgs); + PXOPT_ADD_MODE("-dbs", "list DVO calibration DBs", CALTOOL_MODE_DBS, dbsArgs); + PXOPT_ADD_MODE("-addrun", "add the results of a calibration run", CALTOOL_MODE_ADDRUN, addrunArgs); + PXOPT_ADD_MODE("-runs", "list the results of calibration runs", CALTOOL_MODE_RUNS, runsArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { @@ -105,16 +90,4 @@ psFree(argSets); psFree(modes); - - // generate SQL where clause - config->where = psMetadataAlloc(); - - PXOPT_ADD_WHERE_STR(det_id); - PXOPT_ADD_WHERE_S32(iteration); - PXOPT_ADD_WHERE_S16_ALIAS("-code", "fault"); - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } // define Database handle, if used Index: /branches/eam_branch_20080706/ippTools/src/camtoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/camtoolConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/camtoolConfig.c (revision 18491) @@ -300,21 +300,4 @@ psFree(modes); - // generate SQL where clause - // XXX config->where = psMetadataAlloc(); - // XXX PXOPT_ADD_WHERE_S64(cam_id); - // XXX PXOPT_ADD_WHERE_S64(chip_id); - // XXX PXOPT_ADD_WHERE_STR_ALIAS("-inst","camera"); - // XXX PXOPT_ADD_WHERE_S32(imfiles); - // XXX PXOPT_ADD_WHERE_STR(telescope); - // XXX PXOPT_ADD_WHERE_STR(exp_type); - // XXX PXOPT_ADD_WHERE_STR(class_id); - // XXX PXOPT_ADD_WHERE_STR(filter); - // XXX PXOPT_ADD_WHERE_STR_ALIAS("-code","fault"); - // XXX if (psListLength(config->where->list) < 1) { - // XXX psFree(config->where); - // XXX config->where = NULL; - // XXX } - - // define Database handle, if used config->dbh = psMemIncrRefCounter(pmConfigDB(config->modules)); Index: /branches/eam_branch_20080706/ippTools/src/detselectConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/detselectConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/detselectConfig.c (revision 18491) @@ -83,33 +83,4 @@ psFree(modes); - // setup search criterion - // generate SQL where clause - // config->where = psMetadataAlloc(); - - // PXOPT_ADD_WHERE_STR(det_id); - // PXOPT_ADD_WHERE_S32(iteration); - // PXOPT_ADD_WHERE_STR(exp_id); - // PXOPT_ADD_WHERE_STR_ALIAS("-inst","camera"); - // PXOPT_ADD_WHERE_STR(telescope); - // PXOPT_ADD_WHERE_STR(det_type); - // PXOPT_ADD_WHERE_STR_ALIAS("-type","det_type"); - // PXOPT_ADD_WHERE_STR(exp_type); - // PXOPT_ADD_WHERE_S32(imfiles); - // PXOPT_ADD_WHERE_STR(class); - // PXOPT_ADD_WHERE_STR(class_id); - // PXOPT_ADD_WHERE_STR(filter); - - // PXOPT_ADD_WHERE_F32(exp_time); - // PXOPT_ADD_WHERE_F64(ccd_temp); - // PXOPT_ADD_WHERE_F32(airmass); - // PXOPT_ADD_WHERE_TIME_STR(use_begin); - // PXOPT_ADD_WHERE_TIME_STR(use_end); - - // if (config->where->list->n < 1) { - // psFree(config->where); - // config->where = NULL; - // } - - // define Database handle, if used config->dbh = psMemIncrRefCounter(pmConfigDB(config->modules)); Index: /branches/eam_branch_20080706/ippTools/src/dettool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/dettool.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/dettool.c (revision 18491) @@ -2360,5 +2360,5 @@ PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - psString query = pxDataGet("dettool_revertstacked.sql"); + psString query = pxDataGet("dettool_normalizedimfile.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); Index: /branches/eam_branch_20080706/ippTools/src/difftool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/difftool.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/difftool.c (revision 18491) @@ -104,6 +104,6 @@ // default + PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); diffRunRow *run = diffRunRowAlloc( @@ -282,6 +282,15 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "=="); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); + PXOPT_COPY_STR(config->args, where, "-kind", "kind", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_BOOL(template, config->args, "-template", false); // find all rawImfiles matching the default query @@ -292,9 +301,18 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, NULL); - psStringAppend(&query, " %s", whereClause); + if (template) { + // list only faulted rows + psStringAppend(&query, " %s", "WHERE diffInputSkyfile.template != 0"); + } else { + // don't list faulted rows + psStringAppend(&query, " %s", "WHERE diffInputSkyfile.template = 0"); + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -351,4 +369,7 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -360,9 +381,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "diffSkyfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -418,22 +440,9 @@ { PS_ASSERT_PTR_NON_NULL(config, false); - - // required - PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", true, false); - - // default to 0 + + PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", true, false); // required PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); - - PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); - if (code == 0 && !uri) { - psError(PS_ERR_UNKNOWN, true, "-uri is required"); - return false; - } - - PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - if (code == 0 && !path_base) { - psError(PS_ERR_UNKNOWN, true, "-path_base is required"); - return false; - } + PXOPT_LOOKUP_STR(uri, config->args, "-uri", (code == 0), false); + PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", (code == 0), false); // optional @@ -441,9 +450,9 @@ PXOPT_LOOKUP_F64(bg_stdev, config->args, "-bg_stdev", false, false); PXOPT_LOOKUP_F32(dtime_diff, config->args, "-dtime_diff", false, false); - PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); - PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false); PXOPT_LOOKUP_S32(stamps_num, config->args, "-stamps_num", false, false); PXOPT_LOOKUP_F32(stamps_rms, config->args, "-stamps_rms", false, false); PXOPT_LOOKUP_S32(sources, config->args, "-sources", false, false); + PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); + PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false); if (!psDBTransaction(config->dbh)) { @@ -495,4 +504,9 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -504,9 +518,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "diffSkyfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -563,4 +578,8 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + psString query = pxDataGet("difftool_revertdiffskyfile.sql"); if (!query) { @@ -569,9 +588,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "diffSkyfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -741,12 +761,11 @@ PS_ASSERT_PTR_NON_NULL(config, false); - // required options - PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); - PXOPT_LOOKUP_STR(skycell_id, config->args, "-skycell_id", true, false); - PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", true, false); - - // optional + PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); // required options + PXOPT_LOOKUP_STR(skycell_id, config->args, "-skycell_id", true, false); // required options + PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", true, false); // required options + PXOPT_LOOKUP_S64(template_warp_id, config->args, "-template_warp_id", false, false); PXOPT_LOOKUP_S64(template_stack_id, config->args, "-template_stack_id", false, false); - PXOPT_LOOKUP_S64(template_warp_id, config->args, "-template_warp_id", false, false); + PXOPT_LOOKUP_S64(input_warp_id, config->args, "-input_warp_id", false, false); + PXOPT_LOOKUP_S64(input_stack_id, config->args, "-input_stack_id", false, false); if (template_stack_id && template_warp_id) { @@ -760,6 +779,4 @@ } - PXOPT_LOOKUP_S64(input_stack_id, config->args, "-input_stack_id", false, false); - PXOPT_LOOKUP_S64(input_warp_id, config->args, "-input_warp_id", false, false); if (input_stack_id && input_warp_id) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Only one input can be defined."); @@ -787,10 +804,15 @@ PS_ASSERT_PTR_NON_NULL(config, false); - // required options - PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); - - // default + psMetadata *where = psMetadataAlloc(); + + PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "=="); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); + PXOPT_COPY_STR(config->args, where, "-kind", "kind", "=="); + PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); // required options + PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); + PXOPT_LOOKUP_BOOL(template, config->args, "-template", false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); // find all things to queue @@ -801,9 +823,18 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereSQL(config->where, NULL); - psStringAppend(&query, " %s", whereClause); + if (template) { + // list only faulted rows + psStringAppend(&query, " %s", "WHERE diffInputSkyfile.template != 0"); + } else { + // don't list faulted rows + psStringAppend(&query, " %s", "WHERE diffInputSkyfile.template = 0"); + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { Index: /branches/eam_branch_20080706/ippTools/src/difftoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/difftoolConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/difftoolConfig.c (revision 18491) @@ -47,145 +47,91 @@ // -definerun psMetadata *definerunArgs = psMetadataAlloc(); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID (required)", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); - psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); + psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-diff_id", 0, - "define diff ID (required)", 0); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, - "set state (required)", NULL); -#if 0 - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); -#endif + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-diff_id", 0, "define diff ID (required)", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "set state (required)", NULL); // -addinputskyfile psMetadata *addinputskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, - "define diff ID (required)", 0); - psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "define warp ID", 0); - psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "define stack ID", 0); - psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-kind", 0, - "define kind", NULL); - psMetadataAddBool(addinputskyfileArgs, PS_LIST_TAIL, "-template", 0, - "this sky cell file is the subtrahend", false); + psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, "define diff ID (required)", 0); + psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, "define stack ID", 0); + psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "define warp ID", 0); + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-kind", 0, "define kind", NULL); + psMetadataAddBool(addinputskyfileArgs, PS_LIST_TAIL, "-template", 0, "this sky cell file is the subtrahend", false); // -inputskyfile psMetadata *inputskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, - "search by diff ID", 0); - psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID", 0); - psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, - "search by skycell ID", NULL); - psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, - "search by tess ID", NULL); - psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-kind", 0, - "search by kind", NULL); - psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-template", 0, - "search by subtrahend", false); - psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff ID", 0); + psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL); + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-kind", 0, "search by kind", NULL); + psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-template", 0, "search by subtrahend", false); + psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -todiffskyfile psMetadata *todiffskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(todiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, - "search by diff ID", 0); - psMetadataAddU64(todiffskyfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(todiffskyfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(todiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff ID", 0); + psMetadataAddU64(todiffskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(todiffskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -adddiffskyfile psMetadata *adddiffskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(adddiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, - "define warp ID (required)", 0); - psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URI of file", 0); - psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", 0); - psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background mean stdev", NAN); - psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-dtime_diff", 0, - "define elapsed processing time", NAN); - psMetadataAddS32(adddiffskyfileArgs, PS_LIST_TAIL, "-stamps_num", 0, - "define subtraction stamp number", 0); - psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-stamps_rms", 0, - "define subtraction stamp rms", NAN); - psMetadataAddS32(adddiffskyfileArgs, PS_LIST_TAIL, "-sources", 0, - "define number of sources", 0); - psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-hostname", 0, - "define hostname", 0); - psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, - "define %% of good pixels", NAN); - psMetadataAddS16(adddiffskyfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddS64(adddiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, "define warp ID (required)", 0); + psMetadataAddS16(adddiffskyfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); + psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file", 0); + psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", 0); + psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background mean stdev", NAN); + psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-dtime_diff", 0, "define elapsed processing time", NAN); + psMetadataAddS32(adddiffskyfileArgs, PS_LIST_TAIL, "-stamps_num", 0, "define subtraction stamp number", 0); + psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-stamps_rms", 0, "define subtraction stamp rms", NAN); + psMetadataAddS32(adddiffskyfileArgs, PS_LIST_TAIL, "-sources", 0, "define number of sources", 0); + psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-hostname", 0, "define hostname", 0); + psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, "define %% of good pixels", NAN); // -diffskyfile psMetadata *diffskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, - "search by warp ID", 0); - psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID", NULL); - psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID", NULL); - psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, "search by warp ID", 0); + psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID", NULL); + psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID", NULL); + psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertdiffskyfile psMetadata *revertdiffskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(revertdiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, - "define warp ID (required)", 0); - psMetadataAddS16(revertdiffskyfileArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddS64(revertdiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, "define warp ID (required)", 0); + psMetadataAddS16(revertdiffskyfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -definepoprun psMetadata *definepoprunArgs = psMetadataAlloc(); - psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddTime(definepoprunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID (required)", NULL); - psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); - psMetadataAddBool(definepoprunArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_warp_id", 0, - "define warp ID for template", 0); - psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_stack_id", 0, - "define stack ID for template", 0); - psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-input_warp_id", 0, - "define warp ID for input", 0); - psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-input_stack_id", 0, - "define stack ID for input", 0); + psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddTime(definepoprunArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); + psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); + psMetadataAddBool(definepoprunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_warp_id", 0, "define warp ID for template", 0); + psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_stack_id", 0, "define stack ID for template", 0); + psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-input_warp_id", 0, "define warp ID for input", 0); + psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-input_stack_id", 0, "define stack ID for input", 0); // -definebyquery psMetadata *queueArgs = psMetadataAlloc(); - psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(queueArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff ID", 0); + psMetadataAddS64(queueArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-kind", 0, "search by kind", NULL); + psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-template", 0, "search by subtrahend", false); + psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); psFree(now); @@ -216,18 +162,4 @@ psFree(modes); - // generate SQL where clause - config->where = psMetadataAlloc(); - - PXOPT_ADD_WHERE_S64(diff_id); - PXOPT_ADD_WHERE_S64(warp_id); - PXOPT_ADD_WHERE_STR(skycell_id); - PXOPT_ADD_WHERE_STR(tess_id); - PXOPT_ADD_WHERE_STR_ALIAS("-code", "fault"); - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } - // define Database handle, if used // do this last so we don't setup a connection before CLI options are Index: /branches/eam_branch_20080706/ippTools/src/pxinjectConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pxinjectConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/pxinjectConfig.c (revision 18491) @@ -45,41 +45,25 @@ // -newExp psMetadata *newExpArgs = psMetadataAlloc(); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tmp_exp_name", 0, - "define the exp_name (required)", NULL); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tmp_inst", 0, - "define the camera name (required)", NULL); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tmp_telescope", 0, - "define the telescope name (required)", NULL); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", 0); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-reduction", 0, - "define reduction class", NULL); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-dvodb", 0, - "define the dvodb for the next processing step", NULL); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tess_id", 0, - "define the tess_id for the next processing step", NULL); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-end_stage", 0, - "define the end goal processing step", NULL); - psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-label", 0, - "define a label (carried to chip stage)", NULL); - psMetadataAddBool(newExpArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tmp_exp_name", 0, "define the exp_name (required)", NULL); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tmp_inst", 0, "define the camera name (required)", NULL); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tmp_telescope", 0, "define the telescope name (required)", NULL); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", 0); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class", NULL); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-dvodb", 0, "define the dvodb for the next processing step", NULL); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tess_id", 0, "define the tess_id for the next processing step", NULL); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-end_stage", 0, "define the end goal processing step", NULL); + psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-label", 0, "define a label (carried to chip stage)", NULL); + psMetadataAddBool(newExpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -newImfile psMetadata *newImfileArgs = psMetadataAlloc(); - psMetadataAddS64(newImfileArgs, PS_LIST_TAIL, "-exp_id", 0, - "define the exp_id (required)", 0); - psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-tmp_class_id", 0, - "define the class ID (required)", NULL); - psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-uri", 0, - "define the URI (required)", NULL); + psMetadataAddS64(newImfileArgs, PS_LIST_TAIL, "-exp_id", 0, "define the exp_id (required)", 0); + psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-tmp_class_id", 0, "define the class ID (required)", NULL); + psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-uri", 0, "define the URI (required)", NULL); // -updatenewExp psMetadata *updatenewExpArgs = psMetadataAlloc(); - psMetadataAddS64(updatenewExpArgs, PS_LIST_TAIL, "-exp_id", 0, - "define the exp_id (required)", 0); - psMetadataAddStr(updatenewExpArgs, PS_LIST_TAIL, "-state", 0, - "set state (required)", NULL); - + psMetadataAddS64(updatenewExpArgs, PS_LIST_TAIL, "-exp_id", 0, "define the exp_id (required)", 0); + psMetadataAddStr(updatenewExpArgs, PS_LIST_TAIL, "-state", 0, "set state (required)", NULL); psMetadata *argSets = psMetadataAlloc(); @@ -101,16 +85,4 @@ psFree(modes); - // generate SQL where clause - config->where = psMetadataAlloc(); - - // XXXX this funciton had a large number of bogus entries - PXOPT_ADD_WHERE_S64(exp_id); - PXOPT_ADD_WHERE_STR(class_id); - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } - // define Database handle, if used // do this last so we don't setup a connection before CLI options are Index: /branches/eam_branch_20080706/ippTools/src/pztool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pztool.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/pztool.c (revision 18491) @@ -162,13 +162,20 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); psString query = psStringCopy("SELECT * FROM summitExp"); - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "summitExp"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "summitExp"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -206,8 +213,15 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); + PXOPT_LOOKUP_BOOL(desc, config->args, "-desc", false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + // XXX leave this query here ? psString query = psStringCopy( "SELECT" @@ -223,9 +237,10 @@ ); - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "pzDownloadExp"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "pzDownloadExp"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); psStringAppend(&query, " ORDER BY summitExp.dateobs"); @@ -274,4 +289,10 @@ { PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); PXOPT_LOOKUP_BOOL(desc, config->args, "-desc", false); @@ -300,6 +321,6 @@ psStringAppend(&query, " WHERE camera = \"%s\"", camera); - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "pzDownloadImfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "pzDownloadImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -347,4 +368,5 @@ psFree(result); } + psFree(where); // stitch the arrays of imfiles together @@ -378,4 +400,6 @@ // default values PXOPT_LOOKUP_S16(code, config->args, "-code", false, false); + + // NOTE : the rest of the command-line args are parsed in copydoneCompleteExp if (!pzDownloadImfileInsert(config->dbh, @@ -447,4 +471,6 @@ } + // XXX this is a bit ugly : could just use the PXOPT_COPY_* methods + // and not pass exp_name, camera, or telescope as additional args psMetadata *where = psMetadataAlloc(); if (exp_name) { @@ -472,5 +498,5 @@ } - if (config->where) { + if (psListLength(where->list)) { psString whereClause = psDBGenerateWhereSQL(where, NULL); psStringAppend(&query, " %s", whereClause); @@ -720,10 +746,19 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "inst", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-class", "class", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_LOOKUP_S16(code, config->args, "-code", true, false); - if (!pxSetFaultCode(config->dbh, "pzDownloadImfile", config->where, code)) { + if (!pxSetFaultCode(config->dbh, "pzDownloadImfile", where, code)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); - return false; - } + psFree (where); + return false; + } + psFree(where); return true; @@ -734,4 +769,11 @@ { PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-inst", "inst", "=="); + PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); + PXOPT_COPY_STR(config->args, where, "-class", "class", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); psString query = pxDataGet("pztool_revertcopied.sql"); @@ -741,9 +783,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "pzDownloadImfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "pzDownloadImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -803,4 +846,6 @@ { PS_ASSERT_PTR_NON_NULL(config, false); + + // NOTE : the command-line args are parsed in copydoneCompleteExp // start a transaction so it's all rows or nothing Index: /branches/eam_branch_20080706/ippTools/src/pztoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/pztoolConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/pztoolConfig.c (revision 18491) @@ -45,138 +45,83 @@ // -adddatastore psMetadata *adddatastoreArgs = psMetadataAlloc(); - psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID", NULL); - psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID", NULL); - psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri", 0, - "define storage uri", NULL); + psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID", NULL); + psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID", NULL); + psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-uri", 0, "define storage uri", NULL); // -datastore psMetadata *datastoreArgs = psMetadataAlloc(); - psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddBool(datastoreArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -seen psMetadata *seenArgs = psMetadataAlloc(); - psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_name", 0, - "define exposure ID", NULL); - psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID", NULL); - psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID", NULL); - psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddBool(seenArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure ID", NULL); + psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID", NULL); + psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID", NULL); + psMetadataAddStr(seenArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); + psMetadataAddBool(seenArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -pendingexp psMetadata *pendingexpArgs = psMetadataAlloc(); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_name", 0, - "define exposure ID", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-desc", 0, - "sort ouput in descending format", false); - 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); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure ID", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID", NULL); + psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); + psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-desc", 0, "sort ouput in descending format", false); + 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(); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_name", 0, - "define exposure ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID", NULL); - psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_type", 0, - "define exposure type", NULL); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-desc", 0, - "sort ouput in descending format", false); - psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID", NULL); + psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); + psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-desc", 0, "sort ouput in descending format", false); + psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -copydone psMetadata *copydoneArgs = psMetadataAlloc(); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_name", 0, - "define exposure ID (required)", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID (required)", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID (required)", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class", 0, - "define class", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class_id", 0, - "define class_id", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-uri", 0, - "define storage uri", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-workdir", 0, - "define the \"default\" workdir for this exposure", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-dvodb", 0, - "define the dvodb for the next processing step", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-tess_id", 0, - "define the tess_id for the next processing step", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-end_stage", 0, - "define the end goal processing step", NULL); - psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-label", 0, - "define the label for the chip stage", NULL); - psMetadataAddS16(copydoneArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure ID (required)", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID (required)", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID (required)", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class", 0, "define class", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class_id", 0, "define class_id", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-uri", 0, "define storage uri", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-workdir", 0, "define the \"default\" workdir for this exposure", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-dvodb", 0, "define the dvodb for the next processing step", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-tess_id", 0, "define the tess_id for the next processing step", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-end_stage", 0, "define the end goal processing step", NULL); + psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-label", 0, "define the label for the chip stage", NULL); + psMetadataAddS16(copydoneArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -copied psMetadata *copiedArgs = psMetadataAlloc(); - psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-exp_name", 0, - "define exposure ID", NULL); - psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID", NULL); - psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID", NULL); - psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class", 0, - "define class", NULL); - psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class_id", 0, - "define class_id", NULL); - psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-faulted", 0, - "only return imfiles with a fault status set", false); - psMetadataAddU64(copiedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure ID", NULL); + psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID", NULL); + psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID", NULL); + psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class", 0, "define class", NULL); + psMetadataAddStr(copiedArgs, PS_LIST_TAIL, "-class_id", 0, "define class_id", NULL); + psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-faulted", 0, "only return imfiles with a fault status set", false); + psMetadataAddU64(copiedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(copiedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -updatecopied psMetadata *updatecopiedArgs = psMetadataAlloc(); - psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-exp_name", 0, - "define exposure ID (required)", NULL); - psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID (required)", NULL); - psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID (required)", NULL); - psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class", 0, - "define class", NULL); - psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class_id", 0, - "define class_id", NULL); - psMetadataAddS16(updatecopiedArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure ID (required)", NULL); + psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID (required)", NULL); + psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID (required)", NULL); + psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class", 0, "define class", NULL); + psMetadataAddStr(updatecopiedArgs, PS_LIST_TAIL, "-class_id", 0, "define class_id", NULL); + psMetadataAddS16(updatecopiedArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -revertcopied psMetadata *revertcopiedArgs = psMetadataAlloc(); - psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-exp_name", 0, - "define exposure ID (required)", NULL); - psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-inst", 0, - "define camera ID (required)", NULL); - psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-telescope", 0, - "define telescope ID (required)", NULL); - psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class", 0, - "define class", NULL); - psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class_id", 0, - "define class_id", NULL); - psMetadataAddS16(revertcopiedArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure ID (required)", NULL); + psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-inst", 0, "define camera ID (required)", NULL); + psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-telescope", 0, "define telescope ID (required)", NULL); + psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class", 0, "define class", NULL); + psMetadataAddStr(revertcopiedArgs, PS_LIST_TAIL, "-class_id", 0, "define class_id", NULL); + psMetadataAddS16(revertcopiedArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); // -clearcommonfaults @@ -185,14 +130,9 @@ // -advance psMetadata *advanceArgs = psMetadataAlloc(); - psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-workdir", 0, - "define the \"default\" workdir for this exposure", NULL); - psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-dvodb", 0, - "define the dvodb for the next processing step", NULL); - psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-tess_id", 0, - "define the tess_id for the next processing step", NULL); - psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-end_stage", 0, - "define the end goal processing step", NULL); - psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-label", 0, - "define the label for the chip stage", NULL); + psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-workdir", 0, "define the \"default\" workdir for this exposure", NULL); + psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-dvodb", 0, "define the dvodb for the next processing step", NULL); + psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-tess_id", 0, "define the tess_id for the next processing step", NULL); + psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-end_stage", 0, "define the end goal processing step", NULL); + psMetadataAddStr(advanceArgs, PS_LIST_TAIL, "-label", 0, "define the label for the chip stage", NULL); psMetadata *argSets = psMetadataAlloc(); @@ -222,19 +162,4 @@ psFree(modes); - // generate SQL where clause - config->where = psMetadataAlloc(); - - PXOPT_ADD_WHERE_STR(exp_name); - PXOPT_ADD_WHERE_STR(telescope); - PXOPT_ADD_WHERE_STR_ALIAS("-inst", "camera"); - PXOPT_ADD_WHERE_STR(exp_type); - PXOPT_ADD_WHERE_STR(class); - PXOPT_ADD_WHERE_STR(class_id); - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } - // define Database handle, if used // do this last so we don't setup a connection before CLI options are Index: /branches/eam_branch_20080706/ippTools/src/regtool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/regtool.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/regtool.c (revision 18491) @@ -297,8 +297,4 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); @@ -306,4 +302,8 @@ PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + psString query = pxDataGet("regtool_processedimfile.sql"); if (!query) { @@ -313,5 +313,5 @@ } - if (where) { + if (psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, "rawImfile"); psStringAppend(&query, " AND %s", whereClause); @@ -381,15 +381,23 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tmp_class_id", "tmp_class_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + psString query = pxDataGet("regtool_revertprocessedimfile.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawImfile"); + psFree(where); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "rawImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -413,10 +421,16 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "=="); + PXOPT_LOOKUP_S16(code, config->args, "-code", true, false); - if (!pxSetFaultCode(config->dbh, "rawImfile", config->where, code)) { + if (!pxSetFaultCode(config->dbh, "rawImfile", where, code)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); - return false; - } + psFree (where); + return false; + } + psFree (where); return true; @@ -511,9 +525,10 @@ // optional + PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false); + PXOPT_LOOKUP_STR(exp_type, config->args, "-exp_type", false, false); + PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", false, false); PXOPT_LOOKUP_STR(dvodb, config->args, "-dvodb", false, false); PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", false, false); PXOPT_LOOKUP_STR(end_stage, config->args, "-end_stage", false, false); - PXOPT_LOOKUP_STR(exp_type, config->args, "-exp_type", false, false); - PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", false, false); PXOPT_LOOKUP_STR(reduction, config->args, "-reduction", false, false); PXOPT_LOOKUP_STR(filter, config->args, "-filter", false, false); @@ -561,5 +576,4 @@ PXOPT_LOOKUP_STR(label, config->args, "-label", false, false); PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false); - PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false); // default @@ -789,8 +803,4 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - psString query = pxDataGet("regtool_processedexp.sql"); if (!query) { @@ -812,6 +822,6 @@ PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); - PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); + PXOPT_COPY_F32(config->args, where, "-airmass_min", "airmass", ">="); + PXOPT_COPY_F32(config->args, where, "-airmass_max", "airmass", "<"); PXOPT_COPY_F64(config->args, where, "-ra_min", "ra", ">="); PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); @@ -832,6 +842,6 @@ PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); + PXOPT_COPY_F64(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); + PXOPT_COPY_F64(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); @@ -839,4 +849,8 @@ PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">="); PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); + + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); if (psListLength(where->list)) { @@ -906,15 +920,22 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + psString query = pxDataGet("regtool_revertprocessedexp.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawExp"); + psFree(where); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp"); psStringAppend(&query, " AND %s", whereClause); + psFree(where); psFree(whereClause); } + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -938,10 +959,15 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_LOOKUP_S16(code, config->args, "-code", true, false); - if (!pxSetFaultCode(config->dbh, "rawExp", config->where, code)) { + if (!pxSetFaultCode(config->dbh, "rawExp", 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/eam_branch_20080706/ippTools/src/regtoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/regtoolConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/regtoolConfig.c (revision 18491) @@ -50,10 +50,4 @@ // -pendingimfile psMetadata *pendingimfileArgs = psMetadataAlloc(); -// support for this options is unimplemented -#if 0 - ADD_OPT(Str, pendingimfileArgs, "-exp_id", "search by exposure ID", NULL); - ADD_OPT(Str, pendingimfileArgs, "-class", "search by class", NULL); - ADD_OPT(Str, pendingimfileArgs, "-class_id", "search by class ID", NULL); -#endif ADD_OPT(U64, pendingimfileArgs, "-limit", "limit result set to N items", 0); ADD_OPT(Bool, pendingimfileArgs, "-simple", "use the simple output format", false); @@ -68,8 +62,10 @@ ADD_OPT(Str, addprocessedimfileArgs, "-class_id", "define class ID (required)", NULL); ADD_OPT(Str, addprocessedimfileArgs, "-uri", "define URI (required)", NULL); + ADD_OPT(Str, addprocessedimfileArgs, "-exp_type", "define exposure type", NULL); ADD_OPT(Str, addprocessedimfileArgs, "-filelevel", "define filelevel", NULL); ADD_OPT(Str, addprocessedimfileArgs, "-filter", "define filter ", NULL); ADD_OPT(Str, addprocessedimfileArgs, "-comment", "define comment ", NULL); + ADD_OPT(F32, addprocessedimfileArgs, "-airmass", "define airmass", NAN); ADD_OPT(F64, addprocessedimfileArgs, "-ra", "define RA", NAN); @@ -94,4 +90,5 @@ ADD_OPT(F32, addprocessedimfileArgs, "-m2_tip", "define M2 TIP position", NAN); ADD_OPT(F32, addprocessedimfileArgs, "-m2_tilt", "define M2 TILT position", NAN); + ADD_OPT(F32, addprocessedimfileArgs, "-env_temperature","define Environmental Temperature", NAN); ADD_OPT(F32, addprocessedimfileArgs, "-env_humidity", "define Environmental Humidity", NAN); @@ -139,11 +136,4 @@ // -pendingexp psMetadata *pendingexpArgs = psMetadataAlloc(); -// support for these options in unimplemented -#if 0 - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0, "search by camera", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope",0, "search by telescope", NULL); - psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exposure type", NULL); -#endif 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); @@ -156,7 +146,8 @@ psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-telescope", 0, "define the telescope name (required)", NULL); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, "define the external exposure tag name (required)", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel", 0, "define the data partitioning level of this file (required)", NULL); + psMetadataAddTime(addprocessedexpArgs, PS_LIST_TAIL, "-dateobs", 0, "define observation time", NULL); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_type", 0, "define exposure type", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel", 0, "define the data partitioning level of this file", NULL); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-workdir", 0, "define the \"default\" workdir for this exposure", NULL); psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb", 0, "define the dvodb for the next processing step", NULL); @@ -208,8 +199,4 @@ psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-hostname", 0, "define host name", NULL); psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); - /* - psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip", 0, "define URL", NULL); - psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-mosiac", 0, "define URL", NULL); - */ // -processedexp @@ -297,23 +284,4 @@ psFree(modes); - // generate SQL where clause - config->where = psMetadataAlloc(); - - PXOPT_ADD_WHERE_S64(exp_id); - PXOPT_ADD_WHERE_STR(exp_name); - PXOPT_ADD_WHERE_STR_ALIAS("-inst", "camera"); - PXOPT_ADD_WHERE_STR(telescope); - PXOPT_ADD_WHERE_STR(exp_type); - PXOPT_ADD_WHERE_STR(class); - PXOPT_ADD_WHERE_STR(class_id); - PXOPT_ADD_WHERE_STR(tmp_class_id); - PXOPT_ADD_WHERE_STR(filter); - PXOPT_ADD_WHERE_S16_ALIAS("-code", "fault"); - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } - // define Database handle, if used config->dbh = psMemIncrRefCounter(pmConfigDB(config->modules)); Index: /branches/eam_branch_20080706/ippTools/src/stacktoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/stacktoolConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/stacktoolConfig.c (revision 18491) @@ -47,155 +47,87 @@ // -definebyquery psMetadata *definebyqueryArgs = psMetadataAlloc(); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_skycell_id", 0, - "search for skycell_id", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_good_frac_min", 0, - "define min good_frac", 0.0); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type", 0, - "search for exp_type", "object"); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst", 0, - "search for camera", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope", 0, - "search for telescope", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", 0, - "search for filter", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri", 0, - "search for uri", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min", 0, - "define min exposure time", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max", 0, - "define max exposure time", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max", 0, - "define max solar angle", NAN); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random_subset", 0, - "use a random subset of elements", false); - psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random_limit", 0, - "use this number of random elements", 20); - - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_skycell_id", 0, "search for skycell_id", NULL); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", 0.0); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type", 0, "search for exp_type", "object"); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst", 0, "search for camera", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope", 0, "search for telescope", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", 0, "search for filter", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri", 0, "search for uri", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max", 0, "define max airmass", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min", 0, "define min exposure time", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max", 0, "define max exposure time", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max", 0, "define max solar angle", NAN); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random_subset", 0, "use a random subset of elements", false); + psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random_limit", 0, "use this number of random elements", 20); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -definerun psMetadata *definerunArgs = psMetadataAlloc(); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID (required)", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); - psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-warp_id", - PS_META_DUPLICATE_OK, - "include this warp ID (multiple OK, required)", 0); - - psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); + psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-warp_id", PS_META_DUPLICATE_OK, "include this warp ID (multiple OK, required)", 0); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0, - "define stack ID (required)", 0); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, - "set state (required)", NULL); -#if 0 - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); -#endif + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0, "define stack ID (required)", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "set state (required)", NULL); // -addinputskyfile psMetadata *addinputskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "define stack ID (required)", 0); - psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "define warp ID (required)", 0); + psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, "define stack ID (required)", 0); + psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "define warp ID (required)", 0); // -inputskyfile psMetadata *inputskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "search by stack ID", 0); - psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID", 0); - psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID", 0); + psMetadataAddS64(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -tosum psMetadata *tosumArgs = psMetadataAlloc(); - psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-stack_id", 0, - "search by stack ID", 0); - psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID", 0); - psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tosumArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID", 0); + psMetadataAddS64(tosumArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tosumArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addsumskyfile psMetadata *addsumskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(addsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "define stack ID (required)", 0); - psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-uri", 0, - "define URI of file", 0); - psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", 0); - psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg", 0, - "define exposue background", NAN); - psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposue background mean stdev", NAN); - psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_stack", 0, - "define elapsed processing time", NAN); - psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-hostname", 0, - "define hostname", 0); - psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, - "define %% of good pixels", NAN); - psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddS64(addsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, "define stack ID (required)", 0); + psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file", 0); + psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", 0); + psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); + psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposue background mean stdev", NAN); + psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-dtime_stack", 0, "define elapsed processing time", NAN); + psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-hostname", 0, "define hostname", 0); + psMetadataAddF32(addsumskyfileArgs, PS_LIST_TAIL, "-good_frac", 0, "define %% of good pixels", NAN); + psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -sumskyfile psMetadata *sumskyfileArgs= psMetadataAlloc(); - psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "search by stack ID", 0); - psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID", 0); - psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(sumskyfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID", 0); + psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(sumskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertsumskyfile psMetadata *revertsumskyfileArgs= psMetadataAlloc(); - psMetadataAddS64(revertsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, - "search by stack ID (required)", 0); - psMetadataAddS16(revertsumskyfileArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); + psMetadataAddS64(revertsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack ID (required)", 0); + psMetadataAddS16(revertsumskyfileArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); psFree(now); @@ -204,6 +136,5 @@ psMetadata *modes = psMetadataAlloc(); - PXOPT_ADD_MODE("-definebyquery", "Define a new stackRun by searching for warp IDs", - STACKTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); + PXOPT_ADD_MODE("-definebyquery", "Define a new stackRun by searching for warp IDs", STACKTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); PXOPT_ADD_MODE("-definerun", "", STACKTOOL_MODE_DEFINERUN, definerunArgs); PXOPT_ADD_MODE("-updaterun", "", STACKTOOL_MODE_UPDATERUN, updaterunArgs); Index: /branches/eam_branch_20080706/ippTools/src/warptool.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/warptool.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/warptool.c (revision 18491) @@ -109,25 +109,21 @@ { PS_ASSERT_PTR_NON_NULL(config, false); - - // required options - PXOPT_LOOKUP_S64(fake_id, config->args, "-fake_id", true, false); - PXOPT_LOOKUP_STR(mode, config->args, "-mode", true, false); - // check mode - if (mode && !isValidMode(config, mode)) { - psError(PS_ERR_UNKNOWN, false, "invalud mode"); - return false; - } - PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); - - // optional + + PXOPT_LOOKUP_S64(fake_id, config->args, "-fake_id", true, false); // required + PXOPT_LOOKUP_STR(mode, config->args, "-mode", true, false); // required + PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); // required PXOPT_LOOKUP_STR(label, config->args, "-label", false, false); PXOPT_LOOKUP_STR(dvodb, config->args, "-dvodb", false, false); PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", false, false); PXOPT_LOOKUP_STR(end_stage, config->args, "-end_stage", false, false); - - // default PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); PXOPT_LOOKUP_BOOL(magiced, config->args, "-magiced", false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + // check mode + if (mode && !isValidMode(config, mode)) { + psError(PS_ERR_UNKNOWN, false, "invalid mode"); + return false; + } warpRunRow *warpRun = warpRunRowAlloc( @@ -190,7 +186,6 @@ PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "=="); PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - - PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); - PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); + PXOPT_COPY_F32(config->args, where, "-airmass_min", "airmass", ">="); + PXOPT_COPY_F32(config->args, where, "-airmass_max", "airmass", "<"); PXOPT_COPY_F64(config->args, where, "-ra_min", "ra", ">="); PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); @@ -211,6 +206,6 @@ PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); + PXOPT_COPY_F64(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); + PXOPT_COPY_F64(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); @@ -262,4 +257,8 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -272,9 +271,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "warpRun"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -331,4 +331,8 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -341,9 +345,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "warpRun"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -400,4 +405,7 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -410,9 +418,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpRun"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "warpRun"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -571,4 +580,9 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -581,9 +595,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpSkyCellMap"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "warpSkyCellMap"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -635,8 +650,10 @@ } - static bool towarpedMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); + + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -650,9 +667,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpSkyCellMap"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "warpSkyCellMap"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -891,4 +909,11 @@ PS_ASSERT_PTR_NON_NULL(config, false); + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "=="); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -901,9 +926,10 @@ } - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpSkyfile"); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, "warpSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); // treat limit == 0 as "no limit" @@ -962,9 +988,9 @@ psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); PXOPT_COPY_S64(config->args, where, "-fake_id", "fake_id", "=="); PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); - PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); - PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); // XXX These may need to be updated with the table name? @@ -980,6 +1006,6 @@ PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); - PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); - PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); + PXOPT_COPY_F32(config->args, where, "-airmass_min", "airmass", ">="); + PXOPT_COPY_F32(config->args, where, "-airmass_max", "airmass", "<"); PXOPT_COPY_F64(config->args, where, "-ra_min", "ra", ">="); PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); @@ -1000,6 +1026,6 @@ PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); - PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); + PXOPT_COPY_F64(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); + PXOPT_COPY_F64(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); @@ -1007,5 +1033,5 @@ PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">="); PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); -// PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); + PXOPT_COPY_S16(config->args, where, "-code", "fault", "=="); if (!psListLength(where->list) Index: /branches/eam_branch_20080706/ippTools/src/warptoolConfig.c =================================================================== --- /branches/eam_branch_20080706/ippTools/src/warptoolConfig.c (revision 18490) +++ /branches/eam_branch_20080706/ippTools/src/warptoolConfig.c (revision 18491) @@ -49,353 +49,205 @@ // -definerun psMetadata *definerunArgs = psMetadataAlloc(); - psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-fake_id", 0, - "define camtool ID (required)", 0); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0, - "define mode (required)", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, - "define label", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0, - "define dvodb", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tess_id", NULL); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0, - "define end stage", NULL); - psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); - psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced", 0, - "has this exposure been magiced", false); - psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-fake_id", 0, "define camtool ID (required)", 0); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0, "define mode (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0, "define dvodb", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, "define tess_id", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0, "define end stage", NULL); + psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced", 0, "has this exposure been magiced", false); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -updaterun + // XXX need to allow multiple fake_ids + // XXX need to allow multiple fake_ids + // XXX need to allow multiple chip_ids + // XXX need to allow multiple exp_ids psMetadata *updaterunArgs = psMetadataAlloc(); - // XXX need to allow multiple fake_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - // XXX need to allow multiple fake_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by fake_id", 0); - // XXX need to allow multiple chip_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip_id", 0); - // XXX need to allow multiple exp_ids - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", 0); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, - "set state", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, - "set label", NULL); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id", 0, "search by fake_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "set state", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "set label", NULL); + #if 0 - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0, - "define workdir (required)", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered", 0, - "time detrend run was registered", now); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); #endif // -exp psMetadata *expArgs = psMetadataAlloc(); - psMetadataAddS64(expArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddS64(expArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by camtool ID", 0); - psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(expArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(expArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddS64(expArgs, PS_LIST_TAIL, "-fake_id", 0, "search by camtool ID", 0); + psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(expArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -imfile psMetadata *imfileArgs = psMetadataAlloc(); - psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by camtool ID", 0); - psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(imfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-fake_id", 0, "search by camtool ID", 0); + psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(imfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -tooverlap psMetadata *tooverlapArgs = psMetadataAlloc(); - psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warp ID", 0); - psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(tooverlapArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(tooverlapArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addoverlap psMetadata *addoverlapArgs = psMetadataAlloc(); - psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0, - "path to skycell <-> imfile mapping file", NULL); - psMetadataAddS64(addoverlapArgs, PS_LIST_TAIL, "-warp_id", 0, - "set warp ID", 0); - psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0, "path to skycell <-> imfile mapping file", NULL); + psMetadataAddS64(addoverlapArgs, PS_LIST_TAIL, "-warp_id", 0, "set warp ID", 0); + psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -scmap psMetadata *scmapArgs = psMetadataAlloc(); - psMetadataAddS64(scmapArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0, - "search by skycell ID", NULL); - psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0, - "search by tess ID", NULL); - psMetadataAddU64(scmapArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(scmapArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(scmapArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL); + psMetadataAddU64(scmapArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(scmapArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -towarped psMetadata *towarpedArgs = psMetadataAlloc(); - psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(towarpedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(towarpedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -addwarped psMetadata *addwarpedArgs = psMetadataAlloc(); - psMetadataAddS64(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "define warptool ID (required)", 0); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID (required)", NULL); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID (required)", NULL); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-uri", 0, - "define URI of file", 0); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-path_base", 0, - "define base output location", 0); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg", 0, - "define exposure background", NAN); - psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev", 0, - "define exposure background stdev", NAN); - psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-dtime_warp", 0, - "define elapsed processing time", NAN); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmin", 0, - "define minimum x value", INT_MAX); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmax", 0, - "define maximum x value", -INT_MAX); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymin", 0, - "define minimum y value", INT_MAX); - psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymax", 0, - "define maximum y value", -INT_MAX); - psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-hostname", 0, - "define hostname", 0); - psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-good_frac", 0, - "define %% of good pixels", NAN); - psMetadataAddBool(addwarpedArgs, PS_LIST_TAIL, "-ignore", 0, - "define if this skycell should be ignored", false); - psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code", 0, - "set fault code", 0); + psMetadataAddS64(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, "define warptool ID (required)", 0); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file", 0); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", 0); + psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); + psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev", 0, "define exposure background stdev", NAN); + psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-dtime_warp", 0, "define elapsed processing time", NAN); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmin", 0, "define minimum x value", INT_MAX); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmax", 0, "define maximum x value", -INT_MAX); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymin", 0, "define minimum y value", INT_MAX); + psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymax", 0, "define maximum y value", -INT_MAX); + psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-hostname", 0, "define hostname", 0); + psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-good_frac", 0, "define %% of good pixels", NAN); + psMetadataAddBool(addwarpedArgs, PS_LIST_TAIL, "-ignore", 0, "define if this skycell should be ignored", false); + psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code", 0, "set fault code", 0); // -warped psMetadata *warpedArgs = psMetadataAlloc(); - psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "define skycell ID", NULL); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "define tessellation ID", NULL); - psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0, - "define exposure tag", 0); - psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0, - "define phase 3 version of exposure tag", 0); - psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit", 0, - "limit result set to N items", 0); - psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID", NULL); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID", NULL); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure tag", 0); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0, "define phase 3 version of exposure tag", 0); + psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertwarped + // XXX need to allow multiple fake_ids + // XXX need to allow multiple fake_ids + // XXX need to allow multiple chip_ids + // XXX need to allow multiple exp_ids psMetadata *revertwarpedArgs = psMetadataAlloc(); - // XXX need to allow multiple fake_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID", 0); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, - "search by skycell ID", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, - "searcy by tessellation ID", NULL); - // XXX need to allow multiple fake_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-fake_id", 0, - "search by fake_id", 0); - // XXX need to allow multiple chip_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-chip_id", 0, - "search by chip_id", 0); - // XXX need to allow multiple exp_ids - psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id", 0, - "search by exp_id", 0); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name", 0, - "search by exp_name", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-inst", 0, - "search for camera", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-telescope", 0, - "search for telescope", NULL); - psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0, - "search for exposures by time (>=)", NULL); - psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_end", 0, - "search for exposures by time (<)", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_tag", 0, - "search by exp_tag", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_type", 0, - "search by exp_type", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filelevel", 0, - "search by filelevel", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-reduction", 0, - "search by reduction class", NULL); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filter", 0, - "search for filter", NULL); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_min", 0, - "define min airmass", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_max", 0, - "define max airmass", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_max", 0, - "define max", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_min", 0, - "define min", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_max", 0, - "define max", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, - "define max fraction of saturated pixels", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, - "define min fraction of saturated pixels", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_min", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_min", 0, - "define min", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_max", 0, - "define max", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, - "define min ccd tempature", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, - "define max ccd tempature", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_min", 0, - "define min rotator position angle", NAN); - psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_max", 0, - "define max rotator position angle", NAN); - psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-object", 0, - "search by exposure object", NULL); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_min", 0, - "define min solar angle", NAN); - psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_max", 0, - "define max solar angle", NAN); - - psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-code", 0, - "search by fault code", 0); - psMetadataAddBool(revertwarpedArgs, PS_LIST_TAIL, "-all", 0, - "allow everything to be queued without search terms", false); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-tess_id", 0, "searcy by tessellation ID", NULL); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-fake_id", 0, "search by fake_id", 0); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); + psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_max", 0, "define max", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define min fraction of saturated pixels", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_min", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_min", 0, "define min", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_max", 0, "define max", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); + psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); + psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + + psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-code", 0, "search by fault code", 0); + psMetadataAddBool(revertwarpedArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); // -block psMetadata *blockArgs = psMetadataAlloc(); - psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to mask out (required)", NULL); + psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to mask out (required)", NULL); // -masked psMetadata *maskedArgs = psMetadataAlloc(); - psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); + psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -unblock psMetadata *unblockArgs = psMetadataAlloc(); - psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, - "name of a label to unmask (required)", NULL); + psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label", 0, "name of a label to unmask (required)", NULL); psFree(now); @@ -429,18 +281,4 @@ psFree(modes); - // generate SQL where clause - config->where = psMetadataAlloc(); - - PXOPT_ADD_WHERE_S64(warp_id); - PXOPT_ADD_WHERE_STR(skycell_id); - PXOPT_ADD_WHERE_STR(tess_id); - PXOPT_ADD_WHERE_STR(exp_id); - PXOPT_ADD_WHERE_S16_ALIAS("-code", "fault"); - - if (config->where->list->n < 1) { - psFree(config->where); - config->where = NULL; - } - // define Database handle, if used // do this last so we don't setup a connection before CLI options are