Index: branches/eam_branches/20090715/ippTools/src/dettool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/dettool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/dettool.c (revision 25022) @@ -276,6 +276,6 @@ PXOPT_LOOKUP_F64(posang_min, config->args, "-posang_min", false, false); PXOPT_LOOKUP_F64(posang_max, config->args, "-posang_max", false, false); - PXOPT_LOOKUP_F64(solang_min, config->args, "-solang_min", false, false); - PXOPT_LOOKUP_F64(solang_max, config->args, "-solang_max", false, false); + PXOPT_LOOKUP_F64(solang_min, config->args, "-sun_angle_min", false, false); + PXOPT_LOOKUP_F64(solang_max, config->args, "-sun_angle_max", false, false); PXOPT_LOOKUP_TIME(time_begin, config->args, "-time_begin", false, false); PXOPT_LOOKUP_TIME(time_end, config->args, "-time_end", false, false); @@ -521,6 +521,6 @@ PXOPT_LOOKUP_F64(posang_min, config->args, "-posang_min", false, false); PXOPT_LOOKUP_F64(posang_max, config->args, "-posang_max", false, false); - PXOPT_LOOKUP_F64(solang_min, config->args, "-solang_min", false, false); - PXOPT_LOOKUP_F64(solang_max, config->args, "-solang_max", false, false); + PXOPT_LOOKUP_F64(solang_min, config->args, "-sun_angle_min", false, false); + PXOPT_LOOKUP_F64(solang_max, config->args, "-sun_angle_max", false, false); PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); @@ -557,6 +557,8 @@ PXOPT_COPY_F64(config->args, where, "-select_posang_min", "posang", ">="); PXOPT_COPY_F64(config->args, where, "-select_posang_max", "posang", "<="); - PXOPT_COPY_F64(config->args, where, "-select_solang_min", "solang", ">="); - PXOPT_COPY_F64(config->args, where, "-select_solang_max", "solang", "<="); + PXOPT_COPY_F64(config->args, where, "-select_sun_angle_min", "sun_angle", ">="); + PXOPT_COPY_F64(config->args, where, "-select_sun_angle_max", "sun_angle", "<="); + PXOPT_COPY_F64(config->args, where, "-select_sun_alt_min", "sun_alt", ">="); + PXOPT_COPY_F64(config->args, where, "-select_sun_alt_max", "sun_alt", "<="); PXOPT_COPY_F64(config->args, where, "-select_moon_angle_min", "moon_angle", ">="); @@ -775,6 +777,6 @@ PXOPT_LOOKUP_F64(posang_min, config->args, "-set_posang_min", false, false); PXOPT_LOOKUP_F64(posang_max, config->args, "-set_posang_max", false, false); - PXOPT_LOOKUP_F64(solang_min, config->args, "-set_solang_min", false, false); - PXOPT_LOOKUP_F64(solang_max, config->args, "-set_solang_max", false, false); + PXOPT_LOOKUP_F64(solang_min, config->args, "-set_sun_angle_min", false, false); + PXOPT_LOOKUP_F64(solang_max, config->args, "-set_sun_angle_max", false, false); PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false); PXOPT_LOOKUP_TIME(time_begin, config->args, "-set_time_begin", false, false); @@ -1613,6 +1615,6 @@ PXOPT_LOOKUP_F64(posang_min, config->args, "-posang_min", false, false); PXOPT_LOOKUP_F64(posang_max, config->args, "-posang_max", false, false); - PXOPT_LOOKUP_F64(solang_min, config->args, "-solang_min", false, false); - PXOPT_LOOKUP_F64(solang_max, config->args, "-solang_max", false, false); + PXOPT_LOOKUP_F64(solang_min, config->args, "-sun_angle_min", false, false); + PXOPT_LOOKUP_F64(solang_max, config->args, "-sun_angle_max", false, false); PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); PXOPT_LOOKUP_TIME(time_begin, config->args, "-time_begin", false, false); Index: branches/eam_branches/20090715/ippTools/src/dettoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/dettoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/dettoolConfig.c (revision 25022) @@ -68,6 +68,6 @@ psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); @@ -100,6 +100,6 @@ psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_begin", 0, "detrend applies to exposures taken during this period", NULL); @@ -125,6 +125,8 @@ 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); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_angle_max", 0, "define max solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_alt_min", 0, "define min solar altitude", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_alt_max", 0, "define max solar altitude", NAN); psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_angle_min", 0, "define min moon angle", NAN); @@ -164,6 +166,6 @@ psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_posang_min", 0, "define rotator position angle", NAN); psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_posang_max", 0, "define rotator position angle", NAN); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_solang_min", 0, "define solar angle", NAN); - psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_solang_max", 0, "define solar angle", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_sun_angle_min", 0, "define solar angle", NAN); + psMetadataAddF64(definebydetrunArgs, PS_LIST_TAIL, "-set_sun_angle_max", 0, "define solar angle", NAN); psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_registered", 0, "time detrend run was registered", now); psMetadataAddTime(definebydetrunArgs, PS_LIST_TAIL, "-set_time_begin", 0, "start of period to apply detrend too", NULL); @@ -840,6 +842,6 @@ psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-posang_min", 0, "define min rotator position angle", NAN); psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); psMetadataAddTime(register_detrendArgs, PS_LIST_TAIL, "-time_begin", 0, "detrend applies to exposures taken during this period", NULL); Index: branches/eam_branches/20090715/ippTools/src/difftool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/difftool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/difftool.c (revision 25022) @@ -582,5 +582,5 @@ PXOPT_COPY_STR(config->args, where, "-skycell_id", "diffInputSkyfile.skycell_id", "=="); PXOPT_COPY_S64(config->args, where, "-diff_skyfile_id", "diffInputSkyfile.diff_skyfile_id", "=="); - PXOPT_COPY_STR(config->args, where, "-tess_id", "diffSkyfile.tess_id", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "diffRun.tess_id", "=="); PXOPT_COPY_S16(config->args, where, "-fault", "diffSkyfile.fault", "=="); PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); @@ -661,4 +661,10 @@ PXOPT_COPY_STR(config->args, where, "-label", "diffRun.label", "=="); PXOPT_COPY_S16(config->args, where, "-fault", "fault", "=="); + + if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { + psFree(where); + psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + return false; + } if (!psDBTransaction(config->dbh)) { @@ -1288,4 +1294,35 @@ "ABS(TIME_TO_SEC(TIMEDIFF(inputRawExp.dateobs, templateRawExp.dateobs)))", "<="); + // other where restrictions: + PXOPT_COPY_TIME(config->args, selectWhere, "-dateobs_begin", "inputRawExp.dateobs", ">="); + PXOPT_COPY_TIME(config->args, selectWhere, "-dateobs_end", "inputRawExp.dateobs", "<="); + PXOPT_COPY_RADEC(config->args, selectWhere, "-ra_min", "inputRawExp.ra", ">="); + PXOPT_COPY_RADEC(config->args, selectWhere, "-ra_max", "inputRawExp.ra", "<"); + PXOPT_COPY_RADEC(config->args, selectWhere, "-decl_min", "inputRawExp.decl", ">="); + PXOPT_COPY_RADEC(config->args, selectWhere, "-decl_max", "inputRawExp.decl", "<"); + PXOPT_COPY_F32(config->args, selectWhere, "-sat_pixel_frac_min", "inputRawExp.sat_pixel_frac", ">="); + PXOPT_COPY_F32(config->args, selectWhere, "-sat_pixel_frac_max", "inputRawExp.sat_pixel_frac", "<"); + PXOPT_COPY_F64(config->args, selectWhere, "-airmass_min", "inputRawExp.airmass", ">="); + PXOPT_COPY_F64(config->args, selectWhere, "-airmass_max", "inputRawExp.airmass", "<"); + PXOPT_COPY_F32(config->args, selectWhere, "-exp_time_min", "inputRawExp.exp_time", ">="); + PXOPT_COPY_F32(config->args, selectWhere, "-exp_time_max", "inputRawExp.exp_time", "<"); + PXOPT_COPY_F64(config->args, selectWhere, "-bg_min", "inputRawExp.bg", ">="); + PXOPT_COPY_F64(config->args, selectWhere, "-bg_max", "inputRawExp.bg", "<"); + PXOPT_COPY_F64(config->args, selectWhere, "-bg_stdev_min", "inputRawExp.bg_stdev", ">="); + PXOPT_COPY_F64(config->args, selectWhere, "-bg_stdev_max", "inputRawExp.bg_stdev", "<"); + PXOPT_COPY_F64(config->args, selectWhere, "-bg_mean_stdev_min", "inputRawExp.bg_mean_stdev", ">="); + PXOPT_COPY_F64(config->args, selectWhere, "-bg_mean_stdev_max", "inputRawExp.bg_mean_stdev", "<"); + PXOPT_COPY_F64(config->args, selectWhere, "-alt_min", "inputRawExp.alt", ">="); + PXOPT_COPY_F64(config->args, selectWhere, "-alt_max", "inputRawExp.alt", "<"); + PXOPT_COPY_F64(config->args, selectWhere, "-az_min", "inputRawExp.az", ">="); + PXOPT_COPY_F64(config->args, selectWhere, "-az_max", "inputRawExp.az", "<"); + PXOPT_COPY_F32(config->args, selectWhere, "-ccd_temp_min", "inputRawExp.ccd_temp", ">="); + PXOPT_COPY_F32(config->args, selectWhere, "-ccd_temp_max", "inputRawExp.ccd_temp", "<"); + PXOPT_COPY_F64(config->args, selectWhere, "-posang_min", "inputRawExp.posang", ">="); + PXOPT_COPY_F64(config->args, selectWhere, "-posang_max", "inputRawExp.posang", "<"); + PXOPT_COPY_F32(config->args, selectWhere, "-sun_angle_min", "inputRawExp.sun_angle", ">="); + PXOPT_COPY_F32(config->args, selectWhere, "-sun_angle_max", "inputRawExp.sun_angle", "<"); + PXOPT_COPY_STR(config->args, selectWhere, "-comment", "inputRawExp.comment", "LIKE"); + // Haversine formula for great circle distance PXOPT_COPY_F32(config->args, selectWhere, "-distance", Index: branches/eam_branches/20090715/ippTools/src/difftoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/difftoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/difftoolConfig.c (revision 25022) @@ -133,4 +133,5 @@ psMetadataAddStr(revertdiffskyfileArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL); psMetadataAddS16(revertdiffskyfileArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); + psMetadataAddBool(revertdiffskyfileArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", 0); // -definepoprun @@ -189,4 +190,33 @@ psMetadataAddBool(definewarpwarpArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); psMetadataAddBool(definewarpwarpArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false); + psMetadataAddTime(definewarpwarpArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); + psMetadataAddTime(definewarpwarpArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min RA (degrees) ", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max RA (degrees) ", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min DEC (degrees)", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max DEC (degrees)", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min exposure time", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max exposure time", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by min fraction of saturated pixels", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by max fraction of saturated pixels", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-bg_min", 0, "search by min background", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max background", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by min background standard deviation", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max background standard deviation", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by min background mean standard deviation (across imfiles)", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max background mean standard deviation (across imfiles)", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min altitude", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max altitude", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-az_min", 0, "search by min azimuth ", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-az_max", 0, "search by max azimuth ", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); + psMetadataAddF64(definewarpwarpArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "search by min solar angle", NAN); + psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN); + psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); // -pendingcleanuprun Index: branches/eam_branches/20090715/ippTools/src/faketool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/faketool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/faketool.c (revision 25022) @@ -157,6 +157,6 @@ 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_F32(config->args, where, "-sun_angle_min", "sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "sun_angle", "<"); PXOPT_COPY_STR(config->args, where, "-comment", "comment", "LIKE"); @@ -325,6 +325,6 @@ 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_F32(config->args, where, "-sun_angle_min", "sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "sun_angle", "<"); PXOPT_COPY_STR(config->args, where, "-label", "fakeRun.label", "=="); @@ -669,6 +669,6 @@ 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_F32(config->args, where, "-sun_angle_min", "sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "sun_angle", "<"); if (!psListLength(where->list) Index: branches/eam_branches/20090715/ippTools/src/faketoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/faketoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/faketoolConfig.c (revision 25022) @@ -84,6 +84,6 @@ psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); @@ -137,6 +137,6 @@ 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); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL); @@ -235,6 +235,6 @@ psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddBool(revertprocessedimfileArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); Index: branches/eam_branches/20090715/ippTools/src/magicdstool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/magicdstool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/magicdstool.c (revision 25022) @@ -2,5 +2,5 @@ * magicdstool.c * - * Copyright (C) 2006-2007 IfA + * Copyright (C) 2006-2009 IfA * * This program is free software; you can redistribute it and/or modify it @@ -27,4 +27,5 @@ #include #include +#include #include "pxtools.h" @@ -97,119 +98,114 @@ static bool definebyqueryMode(pxConfig *config) { - PS_ASSERT_PTR_NON_NULL(config, false); - psError(PS_ERR_UNKNOWN, true, "definebyquery not implelmented yet"); - - return false; -#ifdef notyet // Required + PXOPT_LOOKUP_STR(stage, config->args, "-stage", true, false); + + // Optional PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", false, false); - - // Optional - PXOPT_LOOKUP_STR(label, config->args, "-label", false, false); - PXOPT_LOOKUP_STR(dvodb, config->args, "-dvodb", false, false); - PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); + PXOPT_LOOKUP_STR(recoveryroot, config->args, "-recoveryroot", false, false); + PXOPT_LOOKUP_BOOL(re_place, config->args, "-replace", false); + PXOPT_LOOKUP_STR(set_label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false); + PXOPT_LOOKUP_BOOL(dry_run, config->args, "-dry_run", false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - // Create temporary table of the best diffs - { - psString query = pxDataGet("magictool_definebyquery_temp_create.sql"); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - if (!p_psDBRunQuery(config->dbh, query)) { + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); + + // search args + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "=="); + PXOPT_COPY_S64(config->args, where, "-diff_id", "diff_id", "=="); + PXOPT_COPY_S64(config->args, where, "-magic_id","magic_id", "=="); + PXOPT_COPY_S32(config->args, where, "-streaks_max","streaks", "<="); + + pxAddLabelSearchArgs (config, where, "-label", "magicRun.label", "=="); + + ippStage stageNum = ippStringToStage(stage); + + psString query = NULL; + switch (stageNum) { + case IPP_STAGE_RAW: + query = pxDataGet("magicdstool_definebyquery_raw.sql"); + break; + case IPP_STAGE_CHIP: + query = pxDataGet("magicdstool_definebyquery_chip.sql"); + break; + case IPP_STAGE_CAMERA: + query = pxDataGet("magicdstool_definebyquery_camera.sql"); + break; + case IPP_STAGE_WARP: + query = pxDataGet("magicdstool_definebyquery_warp.sql"); + break; + case IPP_STAGE_DIFF: + query = pxDataGet("magicdstool_definebyquery_diff.sql"); + break; + case IPP_STAGE_FAKE: + case IPP_STAGE_STACK: + psError(PXTOOLS_ERR_DATA, true, "%sRuns do not need to be destreaked", stage); + return false; + case IPP_STAGE_NONE: + psError(PXTOOLS_ERR_DATA, true, "%s is not a valid stage", stage); + return false; + default: + psError(PXTOOLS_ERR_PROG, true, "ippStageToString returned %d for invalid stage %s", + stageNum, stage); + return false; + } + + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + char *rerun_flag = rerun ? "\n1 " : "\n0" ; + + if (stageNum != IPP_STAGE_DIFF) { + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, "\nAND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + // treat limit == 0 as "no limit" + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + if (!p_psDBRunQueryF(config->dbh, query, rerun_flag)) { psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - psFree(query); - } - - // Insert list of best diffs into temporary table - { - psString query = pxDataGet("magictool_definebyquery_temp_insert.sql"); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); - PXOPT_COPY_STR(config->args, where, "-diff_label", "diffRun.label", "=="); - PXOPT_COPY_F32(config->args, where, "-good_frac", "warpSkyfile.good_frac", ">="); - - psString whereClause = NULL; // WHERE conditions - if (psListLength(where->list)) { - whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringPrepend(&whereClause, "\n AND "); - } - psFree(where); - - if (!p_psDBRunQueryF(config->dbh, query, whereClause)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(whereClause); psFree(query); return false; } - psFree(whereClause); - psFree(query); - } - - // Get list of exposures ready to magic - { - psString query = pxDataGet("magictool_definebyquery_select.sql"); - if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - return false; - } - - psString magicSkyCellNumsWhere = NULL; // WHERE conditions for magicSkyCellNums - { - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); - PXOPT_COPY_STR(config->args, where, "-diff_label", "diffRun.label", "=="); - PXOPT_COPY_F32(config->args, where, "-good_frac", "warpSkyfile.good_frac", ">="); - - if (psListLength(where->list)) { - magicSkyCellNumsWhere = psDBGenerateWhereConditionSQL(where, NULL); - psStringPrepend(&magicSkyCellNumsWhere, "\n AND "); - } - psFree(where); - } - - // "available" means only concern ourselves with exposures that have all diffs completed, unless we're - // told to only take what's available. - // "new" means we want a new run even if there's already a magic run defined - PXOPT_LOOKUP_BOOL(available, config->args, "-available", false); - PXOPT_LOOKUP_BOOL(new, config->args, "-new", false); - - psString queryWhere = NULL; // WHERE conditions for entire query - if (available) { - psStringAppend(&queryWhere, " WHERE num_done = num_todo"); - } - if (new) { - const char *newWhere = " magic_id IS NULL"; // String to add - if (queryWhere) { - psStringAppend(&queryWhere, " AND %s", newWhere); - } else { - psStringAppend(&queryWhere, " WHERE %s", newWhere); - } - } - if (queryWhere) { - psStringAppend(&query, " %s", queryWhere); - psFree(queryWhere); - } - - - if (!p_psDBRunQueryF(config->dbh, query, magicSkyCellNumsWhere ? magicSkyCellNumsWhere : "")) { + } else { + // diff stage query has two types bothways and !bothways + // so we need to send the rerun flag and the where data twice + psString whereString = psStringCopy(""); + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&whereString, "\nAND %s", whereClause); + psFree(whereClause); + } + psFree(where); + + // treat limit == 0 as "no limit" + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + + if (!p_psDBRunQueryF(config->dbh, query, rerun_flag, whereString, rerun_flag, whereString)) { psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(magicSkyCellNumsWhere); + psFree(whereString); psFree(query); return false; } - psFree(magicSkyCellNumsWhere); - psFree(query); - } + psFree(whereString); + } + psFree(query); psArray *output = p_psDBFetchResult(config->dbh); @@ -233,72 +229,71 @@ } - // Parse the list of exposures ready to magic - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - psString insert = pxDataGet("magictool_definebyquery_insert.sql"); // Insert query + // Parse the list of runs ready to be destreaked + + if (!dry_run && !psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } psArray *list = psArrayAllocEmpty(16); // List of runs, to print for (long i = 0; i < psArrayLength(output); i++) { psMetadata *row = output->data[i]; // Row of interest - psS64 exp_id = psMetadataLookupS64(NULL, row, "exp_id"); // Exposure identifier + psS64 stage_id = psMetadataLookupS64(NULL, row, "stage_id"); + psS64 exp_id = psMetadataLookupS64(NULL, row, "exp_id"); + psS64 magic_id = psMetadataLookupS64(NULL, row, "magic_id"); + psS64 inv_magic_id = psMetadataLookupS64(NULL, row, "inv_magic_id"); + psS64 cam_id = psMetadataLookupS64(NULL, row, "cam_id"); + psString magicRunLabel = psMetadataLookupStr(NULL, row, "label"); + psString magicRunWorkdir = psMetadataLookupStr(NULL, row, "workdir"); + + // if workdir is not supplied use the magicRun's + if (!workdir) { + workdir = magicRunWorkdir; + } + + psString outroot = NULL; + // set outroot to workdir/exp_id/stage for example /somewhere/424242/chip + psStringAppend(&outroot, "%s/%" PRId64 "/%s", workdir, exp_id, stage); // create a new magicRun for this group - magicRunRow *run = magicRunRowAlloc(0, exp_id, "new", workdir, "dirty", label, dvodb, registered, 0); + magicDSRunRow *run = magicDSRunRowAlloc( + 0, // magic_ds_id + magic_id, + inv_magic_id, + "new", + stage, + stage_id, + cam_id, + set_label ? set_label : magicRunLabel, + outroot, + recoveryroot, + re_place, + 0); // remove + + psFree(outroot); if (!run) { - psAbort("failed to alloc magicRun object"); - } - - if (!magicRunInsertObject(config->dbh, run)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(run); - psFree(insert); - psFree(output); - psFree(list); - if (!psDBRollback(config->dbh)) { + psAbort("failed to alloc magicDSRun object"); + } + + if (!dry_run) { + if (!magicDSRunInsertObject(config->dbh, run)) { psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(run); + psFree(output); + psFree(list); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; } - return false; - } - - psS64 magic_id = psDBLastInsertID(config->dbh); // Assigned identifier - run->magic_id = magic_id; + psS64 magic_ds_id = psDBLastInsertID(config->dbh); // Assigned identifier + run->magic_ds_id = magic_ds_id; + } psArrayAdd(list, list->n, run); psFree(run); - - // Create a suitable insertion query for this run - psString thisInsert = psStringCopy(insert); - { - psString idString = NULL; - psStringAppend(&idString, "%" PRId64, magic_id); - psStringSubstitute(&thisInsert, idString, "@MAGIC_ID@"); - psFree(idString); - } - { - psString idString = NULL; - psStringAppend(&idString, "%" PRId64, exp_id); - psStringSubstitute(&thisInsert, idString, "@EXP_ID@"); - psFree(idString); - } - - if (!p_psDBRunQueryF(config->dbh, thisInsert, magic_id, exp_id)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(thisInsert); - psFree(insert); - psFree(output); - psFree(list); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - } - psFree(thisInsert); - } - - if (!psDBCommit(config->dbh)) { + } + + if (!dry_run && !psDBCommit(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); return false; @@ -306,5 +301,5 @@ psFree(output); - if (!magicRunPrintObjects(stdout, list, !simple)) { + if (!magicDSRunPrintObjects(stdout, list, !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print object"); psFree(list); @@ -315,5 +310,4 @@ return true; -#endif // notyet } @@ -344,4 +338,5 @@ 0, // ID magic_id, + 0, // inv_magic_id "new", // state stage, @@ -405,4 +400,5 @@ PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); pxAddLabelSearchArgs (config, where, "-label", "label", "=="); + PXOPT_COPY_STR(config->args, where, "-stage", "stage", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -501,27 +497,33 @@ psMetadata *row = output->data[0]; - psString stage = psMetadataLookupStr(NULL, row, "stage"); + psString stage= psMetadataLookupStr(NULL, row, "stage"); psS64 stage_id = psMetadataLookupS64(NULL, row, "stage_id"); - if (!strcmp(stage, "camera")) { - // no there is no magicked column in camProcessedExp + ippStage stageNum = ippStringToStage(stage); + + // chose the appropriate query based on the stage + switch (stageNum) { + case IPP_STAGE_RAW: + query = "UPDATE rawImfile SET magicked = %" PRId64 " where exp_id = %" PRId64 " AND class_id = '%s'"; + break; + case IPP_STAGE_CHIP: + query = "UPDATE chipProcessedImfile SET magicked = %" PRId64 " where chip_id = %" PRId64 " AND class_id = '%s'"; + break; + case IPP_STAGE_CAMERA: + // no there is no magicked column in camProcessedExp so we have nothing to do psFree(output); return true; - } - - // chose the appropriate query based on the stage - if (!strcmp(stage, "raw")) { - query = "UPDATE rawImfile SET magicked = %" PRId64 " where exp_id = %" PRId64 " AND class_id = '%s'"; - } else if (!strcmp(stage, "chip")) { - query = "UPDATE chipProcessedImfile SET magicked = %" PRId64 " where chip_id = %" PRId64 " AND class_id = '%s'"; - } else if (!strcmp(stage, "warp")) { + case IPP_STAGE_WARP: query = "UPDATE warpSkyfile SET magicked = %" PRId64 " where warp_id = %" PRId64 " AND skycell_id = '%s'"; - } else if (!strcmp(stage, "diff")) { + break; + case IPP_STAGE_DIFF: query = "UPDATE diffSkyfile SET magicked = %" PRId64 " where diff_id = %" PRId64 " AND skycell_id = '%s'"; - } else { + break; + default: psError(PS_ERR_UNKNOWN, true, "unexpected value for stage: %s found", stage); psFree(output); return false; } + if (!p_psDBRunQueryF(config->dbh, query, magic_ds_id, stage_id, component)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -571,17 +573,24 @@ psS64 stage_id = psMetadataLookupS64(NULL, row, "stage_id"); + ippStage stageNum = ippStringToStage(stage); // chose the appropriate query based on the stage - if (!strcmp(stage, "raw")) { + switch (stageNum) { + case IPP_STAGE_RAW: query = "UPDATE rawExp SET magicked = %" PRId64 " where exp_id = %" PRId64; - } else if (!strcmp(stage, "chip")) { + break; + case IPP_STAGE_CHIP: query = "UPDATE chipRun SET magicked = %" PRId64 " where chip_id = %" PRId64; - } else if (!strcmp(stage, "camera")) { + break; + case IPP_STAGE_CAMERA: query = "UPDATE camRun SET magicked = %" PRId64 " where cam_id = %" PRId64; - } else if (!strcmp(stage, "warp")) { + break; + case IPP_STAGE_WARP: query = "UPDATE warpRun SET magicked = %" PRId64 " where warp_id = %" PRId64; - } else if (!strcmp(stage, "diff")) { + break; + case IPP_STAGE_DIFF: query = "UPDATE diffRun SET magicked = %" PRId64 " where diff_id = %" PRId64; - } else { + break; + default: psError(PS_ERR_UNKNOWN, true, "unexpected value for stage: %s found", stage); psFree(output); @@ -671,25 +680,9 @@ PS_ASSERT_PTR_NON_NULL(cam_id, false); - if (!strcmp(stage, "diff")) { - // don't need these ids for diff stage because diff_id is in the magicRun - *stage_id = 0; - *cam_id = 0; - return true; - } - - int stageNum; - if (!strcmp(stage, "raw")) { - stageNum = 0; - } else if (!strcmp(stage, "chip")) { - stageNum = 1; - } else if (!strcmp(stage, "camera")) { - stageNum = 2; - } else if (!strcmp(stage, "warp")) { - stageNum = 3; - } else { - psError(PXTOOLS_ERR_DATA, true, "%s is not a valid value for stage", stage); - return false; - } - + int stageNum = ippStringToStage(stage);; + if (stageNum == IPP_STAGE_NONE) { + psError(PXTOOLS_ERR_DATA, false, "%s is not a valid value for stage", stage); + return false; + } psString query = pxDataGet("magicdstool_getrunids.sql"); @@ -724,12 +717,20 @@ *cam_id = psMetadataLookupS64(NULL, row, "cam_id"); - if (stageNum == 0) { + switch (stageNum) { + case IPP_STAGE_RAW: *stage_id = psMetadataLookupS64(NULL, row, "exp_id"); - } else if (stageNum == 1) { + break; + case IPP_STAGE_CHIP: *stage_id = psMetadataLookupS64(NULL, row, "chip_id"); - } else if (stageNum == 2) { + break; + case IPP_STAGE_CAMERA: *stage_id = *cam_id; - } else if (stageNum == 3) { + return true; + case IPP_STAGE_WARP: *stage_id = psMetadataLookupS64(NULL, row, "warp_id"); + break; + case IPP_STAGE_DIFF: + *stage_id = psMetadataLookupS64(NULL, row, "diff_id"); + break; } Index: branches/eam_branches/20090715/ippTools/src/magicdstoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/magicdstoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/magicdstoolConfig.c (revision 25022) @@ -49,21 +49,28 @@ // -definebyquery psMetadata *definebyqueryArgs = psMetadataAlloc(); -#ifdef notyet - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dvodb", 0, "define dvodb", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search exp_id", 0); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-diff_label", 0, "select diff label", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-good_frac", 0, "limit good_frac", NAN); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-available", 0, "process what's immediately available?", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-new", 0, "generate new run even if existing?", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); -#endif + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-stage", 0, "define stage (required)", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-recoveryroot", 0, "define recovery directory", NULL); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-replace", 0, "replace input files with the destreaked versions", false); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); + + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by magicRun.label", NULL); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic_id", 0); + psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-streaks_max", 0, "maximum number of streaks", 0); + + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-rerun", 0, "queue a new run even if one arleady exists", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-dry_run", 0, "don't queue runs just display what would be queued", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(definebyqueryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); // -definerun psMetadata *definerunArgs = psMetadataAlloc(); psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-magic_id", 0, "define magic_id (required)", 0); - psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-stage", 0, "define output directory (required)", NULL); + psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-stage", 0, "define stage for run (required)", NULL); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-outroot", 0, "define output directory (required)", NULL); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-recoveryroot", 0, "define recovery directory", NULL); @@ -89,4 +96,5 @@ psMetadataAddS64(todestreakArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magic ID", 0); psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "define label", NULL); + psMetadataAddStr(todestreakArgs, PS_LIST_TAIL, "-stage", 0, "limit query to stage", NULL); psMetadataAddU64(todestreakArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); psMetadataAddBool(todestreakArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); Index: branches/eam_branches/20090715/ippTools/src/magictool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/magictool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/magictool.c (revision 25022) @@ -47,4 +47,5 @@ static bool revertmaskMode(pxConfig *config); static bool maskMode(pxConfig *config); +static bool censorrunMode(pxConfig *config); static bool setmagicRunState(pxConfig *config, psS64 magic_id, const char *state); @@ -85,4 +86,5 @@ MODECASE(MAGICTOOL_MODE_REVERTMASK, revertmaskMode); MODECASE(MAGICTOOL_MODE_MASK, maskMode); + MODECASE(MAGICTOOL_MODE_CENSORRUN, censorrunMode); default: psAbort("invalid option (this should not happen)"); @@ -580,4 +582,5 @@ PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); PXOPT_COPY_S16(config->args, where, "-fault", "fault", "=="); + PXOPT_COPY_STR(config->args, where, "-label", "label", "=="); psString query = psStringCopy("UPDATE magicRun SET fault = 0, state = 'new' WHERE fault != 0"); @@ -801,5 +804,7 @@ // treat limit == 0 as "no limit" if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); + // cut limit in half + // hack to prevent pending leaf nodes from blocking branch nodes + psString limitString = psDBGenerateLimitSQL((limit + 1) / 2); psStringAppend(&query, " %s", limitString); psFree(limitString); @@ -847,7 +852,5 @@ // look for tree nodes that need to be processed - // XXX: This gets all nodes from all magicRuns that are in 'new'state - // That doens't seem particularly efficient - query = pxDataGet("magictool_toprocess_tree.sql"); + query = pxDataGet("magictool_toprocess_runs.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); @@ -855,4 +858,9 @@ } + { + psString limitString = psDBGenerateLimitSQL( 100 ); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } if (!p_psDBRunQueryF(config->dbh, query, whereString ? whereString : "")) { @@ -865,6 +873,6 @@ psFree(query); - psArray *magicTree = p_psDBFetchResult(config->dbh); - if (!magicTree) { + psArray *magicRuns = p_psDBFetchResult(config->dbh); + if (!magicRuns) { psErrorCode err = psErrorCodeLast(); switch (err) { @@ -879,42 +887,60 @@ return false; } - if (!psArrayLength(magicTree)) { + if (!psArrayLength(magicRuns)) { psTrace("magictool", PS_LOG_INFO, "no rows found"); - psFree(magicTree); + psFree(magicRuns); return true; } - // entries are ordered by magic_id - long index = 0; - while (index < psArrayLength(magicTree)) { - bool status; + query = pxDataGet("magictool_toprocess_tree.sql"); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + for (psS64 index = 0; index < psArrayLength(magicRuns); index++) { if (limit && (psArrayLength(output) >= limit)) { break; } - psS64 current_magic_id = psMetadataLookupS64(&status, magicTree->data[index], "magic_id"); + bool status; + psS64 magic_id = psMetadataLookupS64(&status, magicRuns->data[index], "magic_id"); if (!status) { psAbort("failed to lookup value for magic_id column"); } - - // find the end of this block - long first = index; - long last = index; - for (long i = index + 1; i < psArrayLength(magicTree); i++) { - psS64 magic_id = psMetadataLookupS64(&status, magicTree->data[i], "magic_id"); - if (!status) { - psAbort("failed to lookup value for magic_id column"); + + whereString = NULL; + psStringAppend(&whereString, "\nAND (magic_id = %" PRId64 ")", magic_id); + if (!p_psDBRunQueryF(config->dbh, query, whereString )) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(whereString); + psFree(query); + return false; + } + psFree(whereString); + psArray *magicTree = p_psDBFetchResult(config->dbh); + if (!magicTree) { + psErrorCode err = psErrorCodeLast(); + switch (err) { + case PS_ERR_DB_CLIENT: + psError(PXTOOLS_ERR_SYS, false, "database error"); + case PS_ERR_DB_SERVER: + psError(PXTOOLS_ERR_PROG, false, "database error"); + default: + psError(PXTOOLS_ERR_PROG, false, "unknown error"); } - if (magic_id != current_magic_id) { - break; - } - last = i; - } - - index = last + 1; - - psHash *forest = psHashAlloc(last - first + 1); + + return false; + } + psS64 length = psArrayLength(magicTree); + if (!length) { + psTrace("magictool", PS_LOG_INFO, "no rows found for magic_id %" PRId64, magic_id); + psFree(magicTree); + continue; + } + + psHash *forest = psHashAlloc(length); // convert the array of metadata into a pxTree structure - for (long i = first; i <= last; i++) { + for (long i = 0; i < length; i++) { bool status; psString node = psMetadataLookupStr(&status, magicTree->data[i], "node"); @@ -941,7 +967,6 @@ pxTreeCrawl(root, findReadyNodes, output); psFree(root); - - } - psFree(magicTree); + psFree(magicTree); + } if (psArrayLength(output)) { @@ -1367,2 +1392,111 @@ return true; } + +static bool censorStage(pxConfig *config, psString stage, psString whereClause) +{ + psString queryFile = NULL; + psStringAppend(&queryFile, "magictool_censor_%s.sql", stage); + psString query = pxDataGet(queryFile); + if (!query) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement from %s", queryFile); + psFree(queryFile); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + psFree(queryFile); + + psStringAppend(&query, " WHERE %s", whereClause); + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + psFree(query); + + return true; +} + +static bool censorrunMode(pxConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + + psError(PS_ERR_PROGRAMMING, true, "-censorrun mode not ready yet"); + return false; + + psMetadata *where = psMetadataAlloc(); + + // at least one of these required + PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); + PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); + + if (!psListLength(where->list)) { + psError(PS_ERR_UNKNOWN, true, "either -exp_id or -magic_id is required"); + psFree(where); + return false; + } + + psString query = psStringCopy("UPDATE magicRun SET state = 'censored'"); + + psString whereClause = psDBGenerateWhereConditionSQL(where, "magicRun"); + psFree(where); + psStringAppend(&query, " WHERE %s", whereClause); + + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(whereClause); + psFree(query); + return false; + } + psFree(query); + + psS32 numUpdated = psDBAffectedRows(config->dbh); + if (numUpdated == 0) { + psError(PS_ERR_UNKNOWN, false, "failed to censor magicRun"); + psFree(whereClause); + return false; + } + + // Now queue any destreaked files to be re-verted + + // note: on failure censorStage issues the rollback + if (!censorStage(config, "raw", whereClause)) { + psFree(whereClause); + return false; + } + if (!censorStage(config, "chip", whereClause)) { + psFree(whereClause); + return false; + } + if (!censorStage(config, "camera", whereClause)) { + psFree(whereClause); + return false; + } + if (!censorStage(config, "warp", whereClause)) { + psFree(whereClause); + return false; + } + if (!censorStage(config, "diff", whereClause)) { + psFree(whereClause); + return false; + } + + psFree(whereClause); + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; +} Index: branches/eam_branches/20090715/ippTools/src/magictool.h =================================================================== --- branches/eam_branches/20090715/ippTools/src/magictool.h (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/magictool.h (revision 25022) @@ -41,8 +41,5 @@ MAGICTOOL_MODE_REVERTMASK, MAGICTOOL_MODE_MASK, - MAGICTOOL_MODE_DIFFSKYFILE, - MAGICTOOL_MODE_WARPSKYFILE, - MAGICTOOL_MODE_CHIPPROCESSEDIMFILE, - MAGICTOOL_MODE_RAWIMFILE, + MAGICTOOL_MODE_CENSORRUN, } MAGICtoolMode; Index: branches/eam_branches/20090715/ippTools/src/magictoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/magictoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/magictoolConfig.c (revision 25022) @@ -108,4 +108,5 @@ psMetadataAddS64(reverttreeArgs, PS_LIST_TAIL, "-magic_id", 0, "search by magictool ID", 0); psMetadataAddS16(reverttreeArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); + psMetadataAddStr(reverttreeArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL); // -inputs @@ -160,30 +161,8 @@ psMetadataAddBool(maskArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); -#ifdef notdef - // -diffskyfile - psMetadata *diffskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(diffskyfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0); - psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class identifier", NULL); - psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell identifier", NULL); - psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - - // -warpskyfile - psMetadata *warpskyfileArgs = psMetadataAlloc(); - psMetadataAddS64(warpskyfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0); - psMetadataAddBool(warpskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddStr(warpskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "define skycell identifier", NULL); - - // -chipprocessedimfile - psMetadata *chipprocessedimfileArgs = psMetadataAlloc(); - psMetadataAddS64(chipprocessedimfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0); - psMetadataAddStr(chipprocessedimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class identifier", NULL); - psMetadataAddBool(chipprocessedimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - - // -rawimfile - psMetadata *rawimfileArgs = psMetadataAlloc(); - psMetadataAddS64(rawimfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0); - psMetadataAddStr(rawimfileArgs, PS_LIST_TAIL, "-class_id", 0, "define class identifier", NULL); - psMetadataAddBool(rawimfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); -#endif // notdef + // -censorun + psMetadata *censorrunArgs = psMetadataAlloc(); + psMetadataAddS64(censorrunArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID", 0); + psMetadataAddS64(censorrunArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID", 0); psFree(now); @@ -208,10 +187,5 @@ PXOPT_ADD_MODE("-revertmask", "", MAGICTOOL_MODE_REVERTMASK, revertmaskArgs); PXOPT_ADD_MODE("-mask", "", MAGICTOOL_MODE_MASK, maskArgs); -#ifdef notdef - PXOPT_ADD_MODE("-diffskyfile", "", MAGICTOOL_MODE_DIFFSKYFILE, diffskyfileArgs); - PXOPT_ADD_MODE("-warpskyfile", "", MAGICTOOL_MODE_WARPSKYFILE, warpskyfileArgs); - PXOPT_ADD_MODE("-chipprocessedimfile", "", MAGICTOOL_MODE_CHIPPROCESSEDIMFILE, chipprocessedimfileArgs); - PXOPT_ADD_MODE("-rawimfile", "", MAGICTOOL_MODE_RAWIMFILE, rawimfileArgs); -#endif + PXOPT_ADD_MODE("-censorrun", "", MAGICTOOL_MODE_CENSORRUN, censorrunArgs); if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) { Index: branches/eam_branches/20090715/ippTools/src/pstamptool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/pstamptool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/pstamptool.c (revision 25022) @@ -34,17 +34,17 @@ static bool datastoreMode(pxConfig *config); static bool moddatastoreMode(pxConfig *config); -static bool addReqMode(pxConfig *config); -static bool completedReqMode(pxConfig *config); -static bool listReqMode(pxConfig *config); -static bool pendingReqMode(pxConfig *config); -static bool updateReqMode(pxConfig *config); -static bool revertReqMode(pxConfig *config); -static bool addJobMode(pxConfig *config); -static bool listJobMode(pxConfig *config); -static bool pendingJobMode(pxConfig *config); -static bool updateJobMode(pxConfig *config); -static bool addProjectMode(pxConfig *config); +static bool addreqMode(pxConfig *config); +static bool completedreqMode(pxConfig *config); +static bool listreqMode(pxConfig *config); +static bool pendingreqMode(pxConfig *config); +static bool updatereqMode(pxConfig *config); +static bool revertreqMode(pxConfig *config); +static bool addjobMode(pxConfig *config); +static bool listjobMode(pxConfig *config); +static bool pendingjobMode(pxConfig *config); +static bool updatejobMode(pxConfig *config); +static bool addprojectMode(pxConfig *config); static bool projectMode(pxConfig *config); -static bool modProjectMode(pxConfig *config); +static bool modprojectMode(pxConfig *config); # define MODECASE(caseName, func) \ @@ -70,16 +70,16 @@ MODECASE(PSTAMPTOOL_MODE_DATASTORE, datastoreMode); MODECASE(PSTAMPTOOL_MODE_MODDATASTORE, moddatastoreMode); - MODECASE(PSTAMPTOOL_MODE_ADDREQ, addReqMode); - MODECASE(PSTAMPTOOL_MODE_COMPLETEDREQ, completedReqMode); - MODECASE(PSTAMPTOOL_MODE_LISTREQ, listReqMode); - MODECASE(PSTAMPTOOL_MODE_PENDINGREQ, pendingReqMode); - MODECASE(PSTAMPTOOL_MODE_UPDATEREQ, updateReqMode); - MODECASE(PSTAMPTOOL_MODE_REVERTREQ, revertReqMode); - MODECASE(PSTAMPTOOL_MODE_ADDJOB, addJobMode); - MODECASE(PSTAMPTOOL_MODE_LISTJOB, listJobMode); - MODECASE(PSTAMPTOOL_MODE_PENDINGJOB, pendingJobMode); - MODECASE(PSTAMPTOOL_MODE_UPDATEJOB, updateJobMode); - MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addProjectMode); - MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modProjectMode); + MODECASE(PSTAMPTOOL_MODE_ADDREQ, addreqMode); + MODECASE(PSTAMPTOOL_MODE_COMPLETEDREQ, completedreqMode); + MODECASE(PSTAMPTOOL_MODE_LISTREQ, listreqMode); + MODECASE(PSTAMPTOOL_MODE_PENDINGREQ, pendingreqMode); + MODECASE(PSTAMPTOOL_MODE_UPDATEREQ, updatereqMode); + MODECASE(PSTAMPTOOL_MODE_REVERTREQ, revertreqMode); + MODECASE(PSTAMPTOOL_MODE_ADDJOB, addjobMode); + MODECASE(PSTAMPTOOL_MODE_LISTJOB, listjobMode); + MODECASE(PSTAMPTOOL_MODE_PENDINGJOB, pendingjobMode); + MODECASE(PSTAMPTOOL_MODE_UPDATEJOB, updatejobMode); + MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode); + MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode); MODECASE(PSTAMPTOOL_MODE_PROJECT, projectMode); default: @@ -220,5 +220,5 @@ } -static bool addReqMode(pxConfig *config) +static bool addreqMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -251,5 +251,5 @@ } -static bool pendingReqMode(pxConfig *config) +static bool pendingreqMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -311,5 +311,5 @@ } -static bool listReqMode(pxConfig *config) +static bool listreqMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -359,5 +359,5 @@ } -static bool completedReqMode(pxConfig *config) +static bool completedreqMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -408,5 +408,5 @@ } -static bool updateReqMode(pxConfig *config) +static bool updatereqMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -472,5 +472,5 @@ } -static bool revertReqMode(pxConfig *config) +static bool revertreqMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -493,5 +493,5 @@ } -static bool addJobMode(pxConfig *config) +static bool addjobMode(pxConfig *config) { bool stampJob = false; @@ -500,10 +500,8 @@ PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_LOOKUP_S64(uri, config->args, "-uri", true, false); PXOPT_LOOKUP_S64(req_id, config->args, "-req_id", true, false); PXOPT_LOOKUP_STR(rownum, config->args, "-rownum", true, false); PXOPT_LOOKUP_STR(job_type, config->args, "-job_type", false, false); PXOPT_LOOKUP_STR(outputBase, config->args, "-outputBase", true, false); - PXOPT_LOOKUP_STR(argString, config->args, "-args", false, false); PXOPT_LOOKUP_STR(stateString, config->args, "-state", false, false); PXOPT_LOOKUP_STR(fault, config->args, "-fault", false, false); @@ -519,10 +517,4 @@ return false; } - - if (stampJob && !argString) { - psError(PS_ERR_UNKNOWN, true, "-args is required for stamp job"); - return false; - } - if (stampJob) { query = pxDataGet("pstamptool_addjob_stampjob.sql"); @@ -535,5 +527,5 @@ } - if (!p_psDBRunQueryF(config->dbh, query, req_id, rownum, stateString, job_type, uri, exp_id, outputBase, fault, argString)) { + if (!p_psDBRunQueryF(config->dbh, query, req_id, rownum, stateString, job_type, exp_id, outputBase, fault)) { psError(PS_ERR_UNKNOWN, false, "database error"); return false; @@ -554,5 +546,5 @@ } -static bool listJobMode(pxConfig *config) +static bool listjobMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -626,5 +618,5 @@ } -static bool pendingJobMode(pxConfig *config) +static bool pendingjobMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -688,5 +680,5 @@ } -static bool updateJobMode(pxConfig *config) +static bool updatejobMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -723,5 +715,5 @@ return true; } -static bool addProjectMode(pxConfig *config) +static bool addprojectMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -801,5 +793,5 @@ return true; } -static bool modProjectMode(pxConfig *config) +static bool modprojectMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); Index: branches/eam_branches/20090715/ippTools/src/pstamptoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/pstamptoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/pstamptoolConfig.c (revision 25022) @@ -100,10 +100,8 @@ // -addjob psMetadata *addjobArgs = psMetadataAlloc(); - psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-uri", 0, "define job file uri", NULL); psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-req_id", 0, "define job req_id", 0); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-rownum", 0, "define job rownum", NULL); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-job_type", 0, "define job job_type", "stamp"); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-outputBase", 0, "define job outputBase", NULL); - psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-args", 0, "define job args", NULL); psMetadataAddStr(addjobArgs, PS_LIST_TAIL, "-state", 0, "new state", "run"); psMetadataAddS64(addjobArgs, PS_LIST_TAIL, "-exp_id", 0, "exposure id", 0); @@ -128,5 +126,4 @@ psMetadataAddS64(updatejobArgs, PS_LIST_TAIL, "-job_id", 0, "req_id for which to change state", 0); psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-state", 0, "new state", NULL); - // psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-result", 0, "new result", NULL); psMetadataAddStr(updatejobArgs, PS_LIST_TAIL, "-fault", 0, "new result", NULL); Index: branches/eam_branches/20090715/ippTools/src/pxcam.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/pxcam.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/pxcam.c (revision 25022) @@ -68,6 +68,6 @@ psMetadataAddF64(md, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(md, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); return true; @@ -113,6 +113,6 @@ PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); - PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">="); - PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<"); + PXOPT_COPY_F32(config->args, where, "-sun_angle_min", "rawExp.sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "rawExp.sun_angle", "<"); return true; Index: branches/eam_branches/20090715/ippTools/src/pxchip.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/pxchip.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/pxchip.c (revision 25022) @@ -69,6 +69,6 @@ psMetadataAddF64(md, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); psMetadataAddF64(md, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN); - psMetadataAddF32(md, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_min", 0, "search by min solar angle", NAN); + psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN); psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); psMetadataAddStr(md, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); @@ -122,6 +122,6 @@ PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); - PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">="); - PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<"); + PXOPT_COPY_F32(config->args, where, "-sun_angle_min", "rawExp.sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "rawExp.sun_angle", "<"); PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE"); PXOPT_COPY_STR(config->args, where, "-obs_mode", "rawExp.obs_mode", "=="); Index: branches/eam_branches/20090715/ippTools/src/regtool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/regtool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/regtool.c (revision 25022) @@ -923,6 +923,6 @@ 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_F32(config->args, where, "-sun_angle_min", "sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "sun_angle", "<"); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); Index: branches/eam_branches/20090715/ippTools/src/regtoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/regtoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/regtoolConfig.c (revision 25022) @@ -138,4 +138,5 @@ ADD_OPT(Bool, processedimfileArgs, "-faulted", "only return imfiles with a fault status set", false); ADD_OPT(Bool, processedimfileArgs, "-simple", "use the simple output format", false); + ADD_OPT(Bool, processedimfileArgs, "-ordered_by_date", "force output to be in DATE order", false); // -revertprocessedimfile @@ -273,6 +274,6 @@ psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_min", 0, "define min solar angle", NAN); - psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-solang_max", 0, "define max solar angle", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); Index: branches/eam_branches/20090715/ippTools/src/stacktool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/stacktool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/stacktool.c (revision 25022) @@ -133,6 +133,6 @@ PXOPT_COPY_F32(config->args, where, "-select_posang_min", "rawExp.posang", ">="); PXOPT_COPY_F32(config->args, where, "-select_posang_max", "rawExp.posang", "<="); - PXOPT_COPY_F32(config->args, where, "-select_solang_min", "rawExp.solang", ">="); - PXOPT_COPY_F32(config->args, where, "-select_solang_max", "rawExp.solang", "<="); + PXOPT_COPY_F32(config->args, where, "-select_sun_angle_min", "rawExp.sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-select_sun_angle_max", "rawExp.sun_angle", "<="); PXOPT_COPY_F32(config->args, where, "-select_fwhm_major_min", "camProcessedExp.fwhm_major", ">="); PXOPT_COPY_F32(config->args, where, "-select_fwhm_major_max", "camProcessedExp.fwhm_major", "<="); @@ -857,4 +857,6 @@ PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); + PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -931,94 +933,33 @@ PXOPT_COPY_S16(config->args, where, "-fault", "stackSumSkyfile.fault", "=="); - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); + if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { psFree(where); - return false; - } - - int numStacks; // Number of stacks affected - - // Update state to 'new' - { - psString update = pxDataGet("stacktool_revertsumskyfile_update.sql"); - if (!update) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - } - - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&update, " AND %s", whereClause); - psFree(whereClause); - } - - if (!p_psDBRunQuery(config->dbh, update)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(update); - psFree(where); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - } - psFree(update); - - numStacks = psDBAffectedRows(config->dbh); - - if (numStacks < 1) { - psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row"); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - } + psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + return false; } // Delete product - { - psString delete = pxDataGet("stacktool_revertsumskyfile_delete.sql"); - if (!delete) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - } - - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&delete, " AND %s", whereClause); - psFree(whereClause); - } - - if (!p_psDBRunQuery(config->dbh, delete)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(delete); - psFree(where); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - } + psString delete = pxDataGet("stacktool_revertsumskyfile_delete.sql"); + if (!delete) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + return false; + } + + if (psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&delete, " AND %s", whereClause); + psFree(whereClause); + } + + if (!p_psDBRunQuery(config->dbh, delete)) { + psError(PS_ERR_UNKNOWN, false, "database error"); psFree(delete); - - if (psDBAffectedRows(config->dbh) != numStacks) { - psError(PS_ERR_UNKNOWN, true, "Updated and deleted different number of entries!"); - psFree(where); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - } - - } - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } + psFree(where); + return false; + } + psFree(delete); + + int numRows = psDBAffectedRows(config->dbh); // Number of row affected + psLogMsg("stacktool", PS_LOG_INFO, "Deleted %d rows", numRows); psFree(where); Index: branches/eam_branches/20090715/ippTools/src/stacktoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/stacktoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/stacktoolConfig.c (revision 25022) @@ -71,6 +71,6 @@ 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); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_angle_min", 0, "define min solar angle", NAN); + psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_angle_max", 0, "define max solar angle", NAN); psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_major_min", 0, "define min fwhm (major axis)", NAN); psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_major_max", 0, "define max fwhm (major axis)", NAN); @@ -159,4 +159,6 @@ 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); + psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", 0); + psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", 0); psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exposure name", NULL); @@ -169,4 +171,5 @@ psMetadataAddStr(revertsumskyfileArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0); psMetadataAddS16(revertsumskyfileArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0); + psMetadataAddBool(revertsumskyfileArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", 0); // -pendingcleanuprun Index: branches/eam_branches/20090715/ippTools/src/warptool.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/warptool.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/warptool.c (revision 25022) @@ -234,6 +234,6 @@ PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); - PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">="); - PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<"); + PXOPT_COPY_F32(config->args, where, "-sun_angle_min", "rawExp.sun_angle", ">="); + PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "rawExp.sun_angle", "<"); PXOPT_COPY_STR(config->args, where, "-reduction", "fakeRun.reduction", "=="); pxAddLabelSearchArgs (config, where, "-label", "fakeRun.label", "=="); @@ -1190,4 +1190,6 @@ PXOPT_COPY_S64(config->args, where, "-warp_id", "warpSkyfile.warp_id", "=="); PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpSkyfile.skycell_id", "=="); + PXOPT_COPY_S64(config->args, where, "-warp_skyfile_id", "warpImfile.warp_skyfile_id", "=="); + PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpSkyfile.skycell_id", "=="); PXOPT_COPY_STR(config->args, where, "-tess_id", "warpSkyfile.tess_id", "=="); PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); Index: branches/eam_branches/20090715/ippTools/src/warptoolConfig.c =================================================================== --- branches/eam_branches/20090715/ippTools/src/warptoolConfig.c (revision 24799) +++ branches/eam_branches/20090715/ippTools/src/warptoolConfig.c (revision 25022) @@ -89,6 +89,6 @@ psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sun_angle_min", 0, "search by min solar angle", NAN); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by fakeRun reduction class", NULL); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search on fakeRun label", NULL); @@ -208,12 +208,13 @@ // -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); - psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_name", 0, "define exposure tag", 0); - psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0, "define phase 3 version of exposure tag", 0); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_skyfile_id", 0, "search by skyfile ID", 0); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tessellation ID", NULL); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure tag", 0); + psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exposure tag", 0); + psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0, "search by 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); + psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); // -revertwarped