Index: trunk/ippTools/share/warptool_revertwarped.sql =================================================================== --- trunk/ippTools/share/warptool_revertwarped.sql (revision 17219) +++ trunk/ippTools/share/warptool_revertwarped.sql (revision 17226) @@ -1,3 +1,8 @@ DELETE FROM warpSkyfile +USING warpSkyfile, warpRun, camRun, chipRun, rawExp WHERE - fault != 0 + warpSkyfile.warp_id = warpRun.warp_id + AND warpRun.cam_id = camRun.cam_id + AND camRun.chip_id = chipRun.chip_id + AND chipRun.exp_id = rawExp.exp_id + AND warpSkyfile.fault != 0 Index: trunk/ippTools/src/camtool.c =================================================================== --- trunk/ippTools/src/camtool.c (revision 17219) +++ trunk/ippTools/src/camtool.c (revision 17226) @@ -162,5 +162,4 @@ && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - where = NULL; psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); return false; @@ -179,4 +178,5 @@ if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); return false; } @@ -184,8 +184,9 @@ if (where && psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, ""); - psFree(where); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { @@ -342,5 +343,4 @@ && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - where = NULL; psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); return false; @@ -843,5 +843,4 @@ && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - where = NULL; psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); return false; Index: trunk/ippTools/src/chiptool.c =================================================================== --- trunk/ippTools/src/chiptool.c (revision 17219) +++ trunk/ippTools/src/chiptool.c (revision 17226) @@ -154,5 +154,4 @@ && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - where = NULL; psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); return false; @@ -175,4 +174,5 @@ if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); return false; } @@ -180,8 +180,9 @@ if (where && psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp"); - psFree(where); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + + psFree(where); if (pretend) { @@ -712,5 +713,4 @@ && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - where = NULL; psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); return false; @@ -720,4 +720,5 @@ if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(where); return false; } @@ -725,8 +726,9 @@ if (where && psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, "chipProcessedImfile"); - psFree(where); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + + psFree(where); if (!p_psDBRunQuery(config->dbh, query)) { Index: trunk/ippTools/src/warptool.c =================================================================== --- trunk/ippTools/src/warptool.c (revision 17219) +++ trunk/ippTools/src/warptool.c (revision 17226) @@ -1013,16 +1013,111 @@ PS_ASSERT_PTR_NON_NULL(config, false); + PXOPT_LOOKUP_STR(warp_id, config->args, "-warp_id", false, false); + PXOPT_LOOKUP_STR(cam_id, config->args, "-cam_id", false, false); + PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", false, false); + PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", false, false); + + psMetadata *where = psMetadataAlloc(); + // convert warp_id into a psS64 + if (warp_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(warp_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id"); + psFree(where); + return false; + } + } + + PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "=="); + + // convert cam_id into a psS64 + if (cam_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "cam_id", 0, "==", (psS64)atoll(cam_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item cam_id"); + psFree(where); + return false; + } + } + + // convert chip_id into a psS64 + if (chip_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "chip_id", 0, "==", (psS64)atoll(chip_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id"); + psFree(where); + return false; + } + } + + // convert exp_id into a psS64 + if (exp_id) { + if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(exp_id))) { + psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id"); + psFree(where); + return false; + } + } + + 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_TIME(config->args, where, "-dateobs_begin", "dateobs", ">="); + PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<="); + PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "=="); + PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); + PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "=="); + 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_F64(config->args, where, "-ra_min", "ra", ">="); + PXOPT_COPY_F64(config->args, where, "-ra_max", "ra", "<"); + PXOPT_COPY_F64(config->args, where, "-decl_min", "decl", ">="); + PXOPT_COPY_F64(config->args, where, "-decl_max", "decl", "<"); + PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); + PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "sat_pixel_frac", ">="); + PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "sat_pixel_frac", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_min", "bt", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_max", "bt", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "bg_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "bg_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "bg_mean_stdev", ">="); + PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "bg_mean_stdev", "<"); + PXOPT_COPY_F64(config->args, where, "-alt_min", "alt", ">="); + PXOPT_COPY_F64(config->args, where, "-alt_max", "alt", "<"); + 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, "-posang_min", "posang", ">="); + PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); + PXOPT_COPY_STR(config->args, where, "-object", "object", "=="); + 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", "=="); + + if (!psListLength(where->list) + && !psMetadataLookupBool(NULL, config->args, "-all")) { + psFree(where); + psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + return false; + } + psString query = pxDataGet("warptool_revertwarped.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "warpSkyfile"); + psFree(where); + return false; + } + + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); } + psFree(where); + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1031,9 +1126,4 @@ } psFree(query); - - if (psDBAffectedRows(config->dbh) < 1) { - psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row"); - return false; - } return true; Index: trunk/ippTools/src/warptoolConfig.c =================================================================== --- trunk/ippTools/src/warptoolConfig.c (revision 17219) +++ trunk/ippTools/src/warptoolConfig.c (revision 17226) @@ -276,12 +276,99 @@ // -revertwarped psMetadata *revertwarpedArgs = psMetadataAlloc(); + // XXX need to allow multiple cam_ids psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, - "search by warptool ID (required)", NULL); + "search by warptool ID", NULL); 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 cam_ids + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-cam_id", 0, + "search by cam_id", NULL); + // XXX need to allow multiple chip_ids + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-chip_id", 0, + "search by chip_id", NULL); + // XXX need to allow multiple exp_ids + psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_id", 0, + "search by exp_id", NULL); + 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