Index: trunk/ippMonitor/def/autocode.php =================================================================== --- trunk/ippMonitor/def/autocode.php (revision 18143) +++ trunk/ippMonitor/def/autocode.php (revision 18193) @@ -69,7 +69,8 @@ // set up the table echo "\n"; -echo "\n"; + +// echo "\n"; // first field is a label set below for the query rows only // ** TABLE HEADER ** -echo "\n"; +// echo "\n"; // query restriction form @@ -86,5 +87,5 @@ // ** TD CLASS ** - echo "\n"; + echo "\n"; // ** TABLE DATA ** echo "\n"; Index: trunk/ippMonitor/def/camPendingExp.d =================================================================== --- trunk/ippMonitor/def/camPendingExp.d (revision 18143) +++ trunk/ippMonitor/def/camPendingExp.d (revision 18193) @@ -20,13 +20,13 @@ FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 10, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 10, %s, Object FIELD rawExp.filter, 10, %s, FILTER -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass -FIELD rawExp.bg, 5, %s, backgnd -FIELD rawExp.bg_stdev, 5, %s, stdev -FIELD rawExp.bg_mean_stdev, 5, %s, <backgnd> -FIELD rawExp.sat_pixel_frac, 5, %s, f(sat pixels) +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, backgnd +FIELD rawExp.bg_stdev, 5, %.2f, stdev +FIELD rawExp.bg_mean_stdev, 5, %.2f, <backgnd> +FIELD rawExp.sat_pixel_frac, 5, %.3f, f(sat pixels) Index: trunk/ippMonitor/def/camProcessedExp.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp.d (revision 18143) +++ trunk/ippMonitor/def/camProcessedExp.d (revision 18193) @@ -27,26 +27,26 @@ # field size format name show link to extras -FIELD chipRun.exp_id, 5, %s, Exp ID, value, chipProcessedImfile.php, ARG1 +FIELD chipRun.exp_id, 5, %d, Exp ID, value, chipProcessedImfile.php, ARG1 FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD chipRun.chip_id, 5, %s, chip ID -FIELD camRun.cam_id, 5, %s, cam ID, value, chipProcessedExp.php, ARG1 +FIELD chipRun.chip_id, 5, %d, chip ID +FIELD camRun.cam_id, 5, %d, cam ID, value, chipProcessedExp.php, ARG1 FIELD *, 8, %s, image, image=JPEG2, camProcessedImfile.php, ARG2 FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 10, %s, Object FIELD rawExp.filter, 10, %s, FILTER -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass FIELD camRun.reduction, 5, %s, reduction -FIELD camProcessedExp.bg, 5, %s, backgnd -FIELD camProcessedExp.bg_stdev, 5, %s, stdev -FIELD camProcessedExp.bg_mean_stdev, 5, %s, <backgnd> -FIELD camProcessedExp.n_stars, 5, %s, Nstars -FIELD camProcessedExp.n_astrom, 5, %s, Nastrom -FIELD camProcessedExp.sigma_ra, 5, %s, sigma ra -FIELD camProcessedExp.fwhm_major, 5, %s, FHWM (major) +FIELD camProcessedExp.bg, 5, %.2f, backgnd +FIELD camProcessedExp.bg_stdev, 5, %.2f, stdev +FIELD camProcessedExp.bg_mean_stdev, 5, %.2f, <backgnd> +FIELD camProcessedExp.n_stars, 5, %d, Nstars +FIELD camProcessedExp.n_astrom, 5, %d, Nastrom +FIELD camProcessedExp.sigma_ra, 5, %f, sigma ra +FIELD camProcessedExp.fwhm_major, 5, %f, FHWM (major) FIELD camProcessedExp.path_base, 5, %s, path_base, none FIELD rawExp.exp_id, 5, %s, Exp ID, none Index: trunk/ippMonitor/def/camProcessedExp_NoImages.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp_NoImages.d (revision 18143) +++ trunk/ippMonitor/def/camProcessedExp_NoImages.d (revision 18193) @@ -28,25 +28,25 @@ # field size format name show link to extras -FIELD chipRun.exp_id, 5, %s, Exp ID, value, chipProcessedImfile.php, ARG1 +FIELD chipRun.exp_id, 5, %d, Exp ID, value, chipProcessedImfile.php, ARG1 FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD chipRun.chip_id, 5, %s, chip ID -FIELD camRun.cam_id, 5, %s, cam ID, value, chipProcessedExp.php, ARG1 +FIELD chipRun.chip_id, 5, %d, chip ID +FIELD camRun.cam_id, 5, %d, cam ID, value, chipProcessedExp.php, ARG1 FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.filter, 10, %s, FILTER FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 10, %s, Object -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass FIELD camRun.reduction, 5, %s, reduction -FIELD camProcessedExp.bg, 5, %s, backgnd -FIELD camProcessedExp.bg_stdev, 5, %s, stdev -FIELD camProcessedExp.bg_mean_stdev, 5, %s, <backgnd> -FIELD camProcessedExp.n_stars, 5, %s, Nstars -FIELD camProcessedExp.n_astrom, 5, %s, Nastrom -FIELD camProcessedExp.sigma_ra, 5, %s, sigma ra -FIELD camProcessedExp.fwhm_major, 5, %s, FHWM (major) +FIELD camProcessedExp.bg, 5, %.2f, backgnd +FIELD camProcessedExp.bg_stdev, 5, %.2f, stdev +FIELD camProcessedExp.bg_mean_stdev, 5, %.2f, <backgnd> +FIELD camProcessedExp.n_stars, 5, %d, Nstars +FIELD camProcessedExp.n_astrom, 5, %d, Nastrom +FIELD camProcessedExp.sigma_ra, 5, %f, sigma ra +FIELD camProcessedExp.fwhm_major, 5, %f, FHWM (major) FIELD camProcessedExp.path_base, 5, %s, path_base, none FIELD rawExp.exp_id, 5, %s, Exp ID, none Index: trunk/ippMonitor/def/camProcessedExp_failure.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp_failure.d (revision 18143) +++ trunk/ippMonitor/def/camProcessedExp_failure.d (revision 18193) @@ -28,25 +28,25 @@ # field size format name show link to extras -FIELD chipRun.exp_id, 5, %s, Exp ID, value, chipProcessedImfile.php, ARG1 +FIELD chipRun.exp_id, 5, %d, Exp ID, value, chipProcessedImfile.php, ARG1 FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD chipRun.chip_id, 5, %s, chip ID -FIELD camRun.cam_id, 5, %s, cam ID, value, chipProcessedExp.php, ARG1 +FIELD chipRun.chip_id, 5, %d, chip ID +FIELD camRun.cam_id, 5, %d, cam ID, value, chipProcessedExp.php, ARG1 FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.filter, 10, %s, FILTER FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 10, %s, Object -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass FIELD camRun.reduction, 5, %s, reduction -FIELD camProcessedExp.bg, 5, %s, backgnd -FIELD camProcessedExp.bg_stdev, 5, %s, stdev -FIELD camProcessedExp.bg_mean_stdev, 5, %s, <backgnd> -FIELD camProcessedExp.n_stars, 5, %s, Nstars -FIELD camProcessedExp.n_astrom, 5, %s, Nastrom -FIELD camProcessedExp.sigma_ra, 5, %s, sigma ra -FIELD camProcessedExp.fwhm_major, 5, %s, FHWM (major) +FIELD camProcessedExp.bg, 5, %.2f, backgnd +FIELD camProcessedExp.bg_stdev, 5, %.2f, stdev +FIELD camProcessedExp.bg_mean_stdev, 5, %.2f, <backgnd> +FIELD camProcessedExp.n_stars, 5, %d, Nstars +FIELD camProcessedExp.n_astrom, 5, %d, Nastrom +FIELD camProcessedExp.sigma_ra, 5, %f, sigma ra +FIELD camProcessedExp.fwhm_major, 5, %f, FHWM (major) FIELD camProcessedExp.path_base, 5, %s, path_base, none FIELD rawExp.exp_id, 5, %s, Exp ID, none Index: trunk/ippMonitor/def/chipPendingExp.d =================================================================== --- trunk/ippMonitor/def/chipPendingExp.d (revision 18143) +++ trunk/ippMonitor/def/chipPendingExp.d (revision 18193) @@ -14,18 +14,18 @@ # field size format name show link to extras -FIELD chipRun.exp_id, 5, %s, Exp ID +FIELD chipRun.exp_id, 5, %d, Exp ID FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD chipRun.chip_id, 7, %s, chip ID +FIELD chipRun.chip_id, 7, %d, chip ID FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.ra, 5, %10.6f, RA, op=OP1 FIELD rawExp.decl, 5, %10.6f, DEC, op=OP2 FIELD rawExp.object, 8, %s, Object -FIELD rawExp.filter, 8, %s, FILTER -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass -FIELD rawExp.bg, 5, %8.2f, backgnd -FIELD rawExp.bg_stdev, 5, %7.2f, stdev +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, backgnd +FIELD rawExp.bg_stdev, 5, %.2f, stdev FIELD rawExp.comment, 5, %s, CMMTOBS Index: trunk/ippMonitor/def/chipProcessedExp.d =================================================================== --- trunk/ippMonitor/def/chipProcessedExp.d (revision 18143) +++ trunk/ippMonitor/def/chipProcessedExp.d (revision 18193) @@ -15,18 +15,18 @@ # field size format name show link to extras -FIELD chipRun.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 -FIELD chipRun.chip_id, 7, %s, chip ID +FIELD chipRun.chip_id, 7, %d, chip ID FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 10, %s, Object FIELD rawExp.filter, 10, %s, FILTER -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass -FIELD rawExp.bg, 5, %s, backgnd -FIELD rawExp.bg_stdev, 5, %s, stdev +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.2f, airmass +FIELD rawExp.bg, 5, %.2f, backgnd +FIELD rawExp.bg_stdev, 5, %.2f, stdev # FIELD rawExp.bg_mean_stdev, 5, %s, <backgnd> Index: trunk/ippMonitor/def/chipProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile.d (revision 18143) +++ trunk/ippMonitor/def/chipProcessedImfile.d (revision 18193) @@ -21,28 +21,24 @@ # field size format name show link to extras -FIELD chipRun.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 FIELD chipProcessedImfile.class_id, 5, %s, Class ID -FIELD chipRun.chip_id, 7, %s, chip ID +FIELD chipRun.chip_id, 7, %d, chip ID FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.filter, 10, %s, FILTER FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 8, %s, Object -FIELD rawExp.filter, 8, %s, Filter -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass -FIELD chipProcessedImfile.bg, 5, %s, backgnd -FIELD chipProcessedImfile.bg_stdev, 5, %s, stdev -FIELD chipProcessedImfile.n_stars, 5, %s, Nstars -FIELD chipProcessedImfile.n_astrom, 5, %s, Nastrom -FIELD chipProcessedImfile.sigma_ra, 5, %s, sigma ra -FIELD chipProcessedImfile.fwhm_major, 5, %s, FHWM +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD chipProcessedImfile.bg, 5, %.2f, backgnd +FIELD chipProcessedImfile.bg_stdev, 5, %.2f, stdev +FIELD chipProcessedImfile.n_stars, 5, %d, Nstars +FIELD chipProcessedImfile.n_astrom, 5, %d, Nastrom +FIELD chipProcessedImfile.sigma_ra, 5, %f, sigma ra +FIELD chipProcessedImfile.fwhm_major, 5, %f, FHWM FIELD chipProcessedImfile.path_base, 5, %s, path_base, none -# FIELD chipPendingExp.reduction, 20, %s, reduction -# FIELD chipPendingExp.guide_id, 20, %s, guide ID -# FIELD chipProcessedImfile.bg_mean_stdev, 5, %s, <backgnd> TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/chipProcessedImfile_failure.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 18143) +++ trunk/ippMonitor/def/chipProcessedImfile_failure.d (revision 18193) @@ -21,28 +21,24 @@ # field size format name show link to extras -FIELD chipRun.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 FIELD chipProcessedImfile.class_id, 5, %s, Class ID -FIELD chipRun.chip_id, 7, %s, chip ID +FIELD chipRun.chip_id, 7, %d, chip ID FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.filter, 10, %s, FILTER FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 8, %s, Object -FIELD rawExp.filter, 8, %s, Filter -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.airmass, 5, %s, airmass -FIELD chipProcessedImfile.bg, 5, %s, backgnd -FIELD chipProcessedImfile.bg_stdev, 5, %s, stdev -FIELD chipProcessedImfile.n_stars, 5, %s, Nstars -FIELD chipProcessedImfile.n_astrom, 5, %s, Nastrom -FIELD chipProcessedImfile.sigma_ra, 5, %s, sigma ra -FIELD chipProcessedImfile.fwhm_major, 5, %s, FHWM +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD chipProcessedImfile.bg, 5, %.2f, backgnd +FIELD chipProcessedImfile.bg_stdev, 5, %.2f, stdev +FIELD chipProcessedImfile.n_stars, 5, %d, Nstars +FIELD chipProcessedImfile.n_astrom, 5, %d, Nastrom +FIELD chipProcessedImfile.sigma_ra, 5, %f, sigma ra +FIELD chipProcessedImfile.fwhm_major, 5, %f, FHWM FIELD chipProcessedImfile.path_base, 5, %s, path_base, none -# FIELD chipPendingExp.reduction, 20, %s, reduction -# FIELD chipPendingExp.guide_id, 20, %s, guide ID -# FIELD chipProcessedImfile.bg_mean_stdev, 5, %s, <backgnd> TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/detInputExp.d =================================================================== --- trunk/ippMonitor/def/detInputExp.d (revision 18143) +++ trunk/ippMonitor/def/detInputExp.d (revision 18193) @@ -26,16 +26,18 @@ FIELD detInputExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD detInputExp.include, 7, %s, include +FIELD detInputExp.include, 3, %t, include FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera FIELD rawExp.exp_type, 10, %s, Type FIELD rawExp.filter, 10, %s, FILTER -FIELD rawExp.dateobs, 20, %s, Date/Time -FIELD rawExp.exp_time, 5, %s, exp_time -FIELD rawExp.sat_pixel_frac, 5, %s, f(sat pixels) -FIELD rawExp.airmass, 5, %s, airmass -FIELD rawExp.bg, 5, %s, backgnd -FIELD rawExp.bg_stdev, 5, %s, stdev -FIELD rawExp.bg_mean_stdev, 5, %s, <backgnd> +FIELD rawExp.dateobs, 19, %T, Date/Time +FIELD rawExp.exp_time, 5, %.2f, exp_time +FIELD rawExp.sat_pixel_frac, 5, %.2f, f(sat pixels) +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, backgnd +FIELD rawExp.bg_stdev, 5, %.2f, stdev +FIELD rawExp.bg_mean_stdev, 5, %.2f, <backgnd> FIELD *, 5, %s, choose, value=resid, detResidImfile.php, ARG2 FIELD *, 5, %s, choose, value=proc, detProcessedImfile.php, ARG3 + +TD_CLASS det_off $detInputExp.include == 0 Index: trunk/ippMonitor/def/detProcessedExp.d =================================================================== --- trunk/ippMonitor/def/detProcessedExp.d (revision 18143) +++ trunk/ippMonitor/def/detProcessedExp.d (revision 18193) @@ -19,19 +19,22 @@ # field size format name show link to extras -FIELD detProcessedExp.det_id, 7, %s, Det ID, value +FIELD detProcessedExp.det_id, 7, %d, Det ID, value FIELD rawExp.camera, 10, %s, camera, value -FIELD detProcessedExp.exp_id, 5, %s, Exp ID, value +FIELD detProcessedExp.exp_id, 5, %d, Exp ID, value FIELD rawExp.exp_name, 5, %s, Exp Name, value +FIELD detProcessedExp.fault, 5, %d, Fault, value FIELD *, 8, %s, image, image=JPEG2, detProcessedImfile.php, ARG1 -FIELD detProcessedExp.bg, 8, %s, backgnd, value -FIELD detProcessedExp.bg_mean_stdev, 8, %s, [stdev], value -FIELD detProcessedExp.bg_stdev, 8, %s, stdev, value -FIELD *, 8, %s, S/N, op=OP1 -FIELD rawExp.dateobs, 8, %s, obs date, value -FIELD rawExp.filter, 8, %s, filter, value -FIELD rawExp.exp_time, 8, %s, exptime, value -FIELD rawExp.ccd_temp, 8, %s, ccd temp, value -FIELD rawExp.airmass, 8, %s, airmass, value +FIELD detProcessedExp.bg, 8, %.3f, backgnd, value +FIELD detProcessedExp.bg_mean_stdev, 8, %.3f, [stdev], value +FIELD detProcessedExp.bg_stdev, 8, %.3f, stdev, value +FIELD *, 8, %.3f, S/N, op=OP1 +FIELD rawExp.dateobs, 19, %T, obs date, value +FIELD rawExp.filter, 10, %s, filter, value +FIELD rawExp.exp_time, 8, %.2f, exptime, value +FIELD rawExp.ccd_temp, 8, %.2f, ccd temp, value +FIELD rawExp.airmass, 8, %.4f, airmass, value FIELD detProcessedExp.path_base, 20, %s, path_base, none + +# TD_CLASS det_off $detProcessedExp.fault > 0 # note: you must include all desired fields, where ever they are used, Index: trunk/ippMonitor/def/detProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/detProcessedImfile.d (revision 18143) +++ trunk/ippMonitor/def/detProcessedImfile.d (revision 18193) @@ -12,4 +12,5 @@ FIELD rawExp.exp_name, 5, %s, Exp Name FIELD detProcessedImfile.class_id, 8, %s, Chip ID +FIELD detProcessedImfile.fault, 5, %d, Chip ID FIELD detProcessedImfile.bg, 8, %f, backgnd FIELD detProcessedImfile.bg_stdev, 8, %s, stdev @@ -17,4 +18,7 @@ FIELD detProcessedImfile.path_base, 10, %s, path_base +TD_CLASS det_off $detProcessedImfile.fault > 0 + TAIL PHP insert_image ('PPIMAGE.JPEG1'); TAIL PHP insert_log ('LOG.EXP'); + Index: trunk/ippMonitor/def/detResidExp.d =================================================================== --- trunk/ippMonitor/def/detResidExp.d (revision 18143) +++ trunk/ippMonitor/def/detResidExp.d (revision 18193) @@ -1,3 +1,3 @@ -TABLE detResidExp, rawExp +TABLE detResidExp, rawExp, detInputExp TITLE detResidExp FILE detResidExp.php @@ -6,4 +6,6 @@ # the following WHERE clauses are added to all queries joined by AND WHERE detResidExp.exp_id = rawExp.exp_id +WHERE detResidExp.exp_id = detInputExp.exp_id +WHERE detResidExp.iteration = detInputExp.iteration # define image names to be used below @@ -20,5 +22,5 @@ ARGS ARG2 basename=$detResidExp.path_base -OP OP1 $detResidExp.bg / $detResidExp.bin_stdev +OP OP1 $detResidExp.bin_stdev > 0.0 ? $detResidExp.bg / $detResidExp.bin_stdev : NAN # field size format name show link to linkargs @@ -28,23 +30,27 @@ FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 FIELD detResidExp.iteration, 5, %s, iter, value +FIELD detInputExp.include, 3, %t, used, value +FIELD detResidExp.accept, 3, %t, keep, value +FIELD detResidExp.fault, 4, %d, fault, value FIELD *, 8, %s, image, image=JPEG2, detResidImfile.php, ARG2 -FIELD detResidExp.bg, 8, %s, backgnd, value -FIELD detResidExp.bg_mean_stdev, 8, %s, [stdev] -FIELD detResidExp.bg_stdev, 8, %s, stdev, value -FIELD detResidExp.bin_stdev, 8, %s, bin stdev, value +FIELD detResidExp.bg, 8, %.3f, backgnd, value +FIELD detResidExp.bg_mean_stdev, 8, %.3f, [stdev], value +FIELD detResidExp.bg_stdev, 8, %.3f, stdev, value +FIELD detResidExp.bin_stdev, 8, %.3f, bin stdev, value FIELD *, 8, %s, S/N, op=OP1 -FIELD detResidExp.fringe_0, 8, %s, fringe, value -FIELD detResidExp.fringe_1, 8, %s, fringe err, value -FIELD detResidExp.fringe_2, 8, %s, fringe stdev, value -FIELD detResidExp.user_1, 8, %s, dfringe, value -FIELD detResidExp.user_2, 8, %s, dfringe err, value -FIELD detResidExp.user_3, 8, %s, dfringe stdev, value -FIELD rawExp.dateobs, 8, %s, obs date, value -FIELD rawExp.filter, 8, %s, filter, value -FIELD rawExp.exp_time, 8, %s, exptime, value -FIELD rawExp.ccd_temp, 8, %s, ccd temp, value -FIELD rawExp.airmass, 8, %s, airmass, value -FIELD detResidExp.accept, 4, %s, keep, value +FIELD detResidExp.fringe_0, 8, %.3f, fringe, value +FIELD detResidExp.fringe_1, 8, %.3f, fringe err, value +FIELD detResidExp.fringe_2, 8, %.3f, fringe stdev, value +FIELD detResidExp.user_1, 8, %.3f, dfringe, value +FIELD detResidExp.user_2, 8, %.3f, dfringe err, value +FIELD detResidExp.user_3, 8, %.3f, dfringe stdev, value +FIELD rawExp.dateobs, 19, %T, obs date, value +FIELD rawExp.filter, 10, %s, filter, value +FIELD rawExp.exp_time, 8, %.2f, exptime, value +FIELD rawExp.ccd_temp, 8, %.2f, ccd temp, value +FIELD rawExp.airmass, 8, %.4f, airmass, value FIELD detResidExp.path_base, 20, %s, path_base, none -TD_CLASS list_off $detResidExp.accept == 0 +TD_CLASS det_drop $detInputExp.include == 1 && $detResidExp.accept == 0 +TD_CLASS det_off $detInputExp.include == 0 && $detResidExp.accept == 0 +TD_CLASS det_add $detInputExp.include == 0 && $detResidExp.accept == 1 Index: trunk/ippMonitor/def/detStackedImfile.d =================================================================== --- trunk/ippMonitor/def/detStackedImfile.d (revision 18143) +++ trunk/ippMonitor/def/detStackedImfile.d (revision 18193) @@ -8,8 +8,8 @@ FIELD iteration, 5, %s, iteration FIELD class_id, 8, %s, class_id -FIELD bg, 8, %s, backgnd -FIELD bg_stdev, 8, %s, stdev -FIELD bg_mean_stdev, 8, %s, [stdev] -FIELD fault, 5, %s, fault +FIELD fault, 5, %d, fault +FIELD bg, 8, %f, backgnd +FIELD bg_stdev, 8, %f, stdev +FIELD bg_mean_stdev, 8, %f, [stdev] FIELD uri, 20, %s, uri # FIELD recipe, 20, recipe Index: trunk/ippMonitor/def/newExp.d =================================================================== --- trunk/ippMonitor/def/newExp.d (revision 18143) +++ trunk/ippMonitor/def/newExp.d (revision 18193) @@ -7,5 +7,5 @@ # field size format name show link to extras -FIELD exp_id, 5, %s, exposure ID +FIELD exp_id, 5, %d, exposure ID FIELD tmp_exp_name, 10, %s, exposure Name FIELD tmp_camera, 5, %s, camera Index: trunk/ippMonitor/def/newImfile.d =================================================================== --- trunk/ippMonitor/def/newImfile.d (revision 18143) +++ trunk/ippMonitor/def/newImfile.d (revision 18193) @@ -5,5 +5,5 @@ # field size format name show link to extras -FIELD exp_id, 5, %s, exposure ID +FIELD exp_id, 5, %d, exposure ID FIELD tmp_class_id, 5, %s, class ID FIELD uri, 5, %s, URI Index: trunk/ippMonitor/def/pzDoneExp.d =================================================================== --- trunk/ippMonitor/def/pzDoneExp.d (revision 18143) +++ trunk/ippMonitor/def/pzDoneExp.d (revision 18193) @@ -13,5 +13,5 @@ FIELD summitExp.camera, 5, %s, camera FIELD summitExp.telescope, 5, %s, telescope -FIELD summitExp.dateobs, 5, %s, date/time +FIELD summitExp.dateobs, 19, %T, date/time FIELD summitExp.exp_type, 5, %s, type FIELD summitExp.uri, 5, %s, URI Index: trunk/ippMonitor/def/pzDoneExp_failed.d =================================================================== --- trunk/ippMonitor/def/pzDoneExp_failed.d (revision 18143) +++ trunk/ippMonitor/def/pzDoneExp_failed.d (revision 18193) @@ -16,5 +16,5 @@ FIELD summitExp.camera, 5, %s, camera FIELD summitExp.telescope, 5, %s, telescope -FIELD summitExp.dateobs, 5, %s, date/time +FIELD summitExp.dateobs, 5, %T, date/time FIELD summitExp.exp_type, 5, %s, type FIELD summitExp.uri, 5, %s, URI Index: trunk/ippMonitor/def/pzPendingExp.d =================================================================== --- trunk/ippMonitor/def/pzPendingExp.d (revision 18143) +++ trunk/ippMonitor/def/pzPendingExp.d (revision 18193) @@ -13,5 +13,5 @@ FIELD summitExp.camera, 5, %s, camera FIELD summitExp.telescope, 5, %s, telescope -FIELD summitExp.dateobs, 5, %s, date/time +FIELD summitExp.dateobs, 5, %T, date/time FIELD summitExp.exp_type, 5, %s, type FIELD summitExp.uri, 5, %s, URI Index: trunk/ippMonitor/def/rawDetrendExp.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp.d (revision 18143) +++ trunk/ippMonitor/def/rawDetrendExp.d (revision 18193) @@ -10,15 +10,16 @@ # field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID -FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, %s, Telescope -FIELD camera, 10, %s, Camera -FIELD exp_type, 10, %s, Type +FIELD exp_id, 5, %d, Exp ID +FIELD exp_name, 8, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD telescope, 8, %s, Telescope +FIELD camera, 8, %s, Camera +FIELD exp_type, 8, %s, Type +FIELD dateobs, 19, %T, Date/Time FIELD filter, 10, %s, FILTER -FIELD dateobs, 20, %s, Date/Time -FIELD exp_time, 5, %s, exp_time -FIELD sat_pixel_frac, 5, %s, f(sat pixels) -FIELD airmass, 5, %s, airmass -FIELD bg, 5, %s, backgnd -FIELD bg_stdev, 5, %s, stdev -FIELD bg_mean_stdev, 5, %s, <backgnd> +FIELD airmass, 5, %.2f, airmass +FIELD exp_time, 5, %.2f, exp_time +FIELD ccd_temp, 5, %.2f, ccd_temp +FIELD sat_pixel_frac, 5, %.4f, f(sat pixels) +FIELD bg, 5, %.2f, backgnd +FIELD bg_stdev, 5, %.2f, stdev +FIELD bg_mean_stdev, 5, %.2f, <backgnd> Index: trunk/ippMonitor/def/rawDetrendExp_detrend.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 18143) +++ trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 18193) @@ -10,5 +10,5 @@ # field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID +FIELD exp_id, 5, %d, Exp ID FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 FIELD telescope, 10, %s, Telescope @@ -16,9 +16,9 @@ FIELD exp_type, 10, %s, Type FIELD filter, 10, %s, FILTER -FIELD dateobs, 20, %s, Date/Time -FIELD exp_time, 5, %s, exp_time -FIELD sat_pixel_frac, 5, %s, f(sat pixels) -FIELD airmass, 5, %s, airmass -FIELD bg, 5, %s, backgnd -FIELD bg_stdev, 5, %s, stdev -FIELD bg_mean_stdev, 5, %s, <backgnd> +FIELD dateobs, 19, %T, Date/Time +FIELD exp_time, 5, %.2f, exp_time +FIELD sat_pixel_frac, 5, %.2f, f(sat pixels) +FIELD airmass, 5, %.4f, airmass +FIELD bg, 5, %.2f, backgnd +FIELD bg_stdev, 5, %.2f, stdev +FIELD bg_mean_stdev, 5, %.2f, <backgnd> Index: trunk/ippMonitor/def/rawExp.d =================================================================== --- trunk/ippMonitor/def/rawExp.d (revision 18143) +++ trunk/ippMonitor/def/rawExp.d (revision 18193) @@ -10,22 +10,18 @@ # field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID +FIELD exp_id, 5, %d, Exp ID FIELD exp_name, 10, %s, Exp Name, value, rawImfile.php, ARG1 FIELD telescope, 10, %s, Telescope FIELD camera, 10, %s, Camera FIELD exp_type, 8, %s, Type -FIELD dateobs, 8, %s, Date/Time +FIELD dateobs, 19, %T, Date/Time FIELD ra, 8, %10.6f, RA, op=OP1 FIELD decl, 8, %10.6f, DEC, op=OP2 FIELD object, 10, %s, object FIELD filter, 10, %s, FILTER -FIELD airmass, 5, %s, airmass -FIELD exp_time, 5, %s, exp_time -FIELD bg, 5, %s, bg -FIELD bg_stdev, 5, %s, bg_stdev -# FIELD imfiles, 20, imfiles -# FIELD bg_mean_stdev, 20, bg_mean_stdev -# FIELD alt, 20, alt -# FIELD az, 20, az -# FIELD ccd_temp, 20, ccd_temp -# FIELD posang, 20, posang +FIELD airmass, 5, %.4f, airmass +FIELD exp_time, 5, %.2f, exp_time +FIELD ccd_temp, 5, %.2f, ccd_temp +FIELD bg, 8, %.2f, backgnd +FIELD bg_stdev, 8, %.2f, stdev +FIELD bg_mean_stdev, 8, %.2f, [stdev] Index: trunk/ippMonitor/def/rawExp_failed.d =================================================================== --- trunk/ippMonitor/def/rawExp_failed.d (revision 18143) +++ trunk/ippMonitor/def/rawExp_failed.d (revision 18193) @@ -21,5 +21,5 @@ FIELD decl, 8, %10.6f, DEC, op=OP2 FIELD filter, 10, %s, FILTER -FIELD dateobs, 20, %s, Date/Time +FIELD dateobs, 19, %T, Date/Time FIELD exp_time, 5, %s, exp_time FIELD airmass, 5, %s, airmass Index: trunk/ippMonitor/def/rawImfile.d =================================================================== --- trunk/ippMonitor/def/rawImfile.d (revision 18143) +++ trunk/ippMonitor/def/rawImfile.d (revision 18193) @@ -10,23 +10,24 @@ # field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID +FIELD exp_id, 5, %d, Exp ID FIELD exp_name, 5, %s, Exposure +FIELD telescope, 10, %s, Telescope +FIELD camera, 10, %s, Camera FIELD class_id, 8, %s, Chip ID +FIELD exp_type, 8, %s, exp_type +FIELD dateobs, 19, %T, Date/Time FIELD ra, 8, %10.6f, RA, op=OP1 FIELD decl, 8, %10.6f, DEC, op=OP2 FIELD object, 8, %s, object -FIELD filter, 8, %s, FILTER -FIELD airmass, 5, %s, airmass -FIELD exp_time, 5, %s, exp_time -FIELD bg, 8, %s, backgnd -FIELD bg_stdev, 8, %s, stdev -FIELD bg_mean_stdev, 8, %s, [stdev] -FIELD exp_type, 8, %s, exp_type +FIELD filter, 10, %s, FILTER +FIELD airmass, 5, %.4f, airmass +FIELD exp_time, 5, %.2f, exp_time +FIELD ccd_temp, 5, %.2f, ccd_temp +FIELD bg, 8, %.2f, backgnd +FIELD bg_stdev, 8, %.2f, stdev +FIELD bg_mean_stdev, 8, %.2f, [stdev] FIELD uri, 10, %s, uri -# FIELD airmass, 20, airmass -# FIELD exp_time, 20, exp_time # FIELD alt, 20, alt # FIELD az, 20, az -# FIELD ccd_temp, 20, ccd_temp # FIELD posang, 20, posang # FIELD object, 20, object Index: trunk/ippMonitor/def/rawScienceExp.d =================================================================== --- trunk/ippMonitor/def/rawScienceExp.d (revision 18143) +++ trunk/ippMonitor/def/rawScienceExp.d (revision 18193) @@ -13,22 +13,18 @@ # field size format name show link to extras -FIELD exp_id, 5, %s, Exp ID +FIELD exp_id, 5, %d, Exp ID FIELD exp_name, 8, %s, Exp Name, value, rawImfile.php, ARG1 FIELD telescope, 8, %s, Telescope FIELD camera, 8, %s, Camera -FIELD dateobs, 8, %s, Date/Time +FIELD dateobs, 19, %T, Date/Time FIELD ra, 8, %10.6f, RA, op=OP1 FIELD decl, 8, %10.6f, DEC, op=OP2 FIELD object, 8, %s, object -FIELD filter, 8, %s, FILTER +FIELD filter, 10, %s, FILTER FIELD exp_time, 5, %s, exp_time -FIELD airmass, 5, %s, airmass -FIELD bg, 5, %s, bg -FIELD bg_stdev, 5, %s, bg_stdev -# FIELD imfiles, 20, imfiles -# FIELD bg_mean_stdev, 20, bg_mean_stdev -# FIELD alt, 20, alt -# FIELD az, 20, az -# FIELD ccd_temp, 20, ccd_temp -# FIELD posang, 20, posang -# FIELD exp_type, 8, %s, Type +FIELD airmass, 5, %.4f, airmass +FIELD exp_time, 5, %.2f, exp_time +FIELD ccd_temp, 5, %.2f, ccd_temp +FIELD bg, 8, %.2f, backgnd +FIELD bg_stdev, 8, %.2f, stdev +FIELD bg_mean_stdev, 8, %.2f, [stdev] Index: trunk/ippMonitor/def/rawUnknownExp.d =================================================================== --- trunk/ippMonitor/def/rawUnknownExp.d (revision 18143) +++ trunk/ippMonitor/def/rawUnknownExp.d (revision 18193) @@ -18,5 +18,5 @@ FIELD telescope, 10, %s, Telescope FIELD camera, 10, %s, Camera -FIELD dateobs, 20, %s, Date/Time +FIELD dateobs, 19, %T, Date/Time FIELD ra, 8, %10.6f, RA, op=OP1 FIELD decl, 8, %10.6f, DEC, op=OP2 Index: trunk/ippMonitor/def/stackInputSkyfile.d =================================================================== --- trunk/ippMonitor/def/stackInputSkyfile.d (revision 18143) +++ trunk/ippMonitor/def/stackInputSkyfile.d (revision 18193) @@ -22,11 +22,11 @@ FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 8, %s, Object -FIELD rawExp.filter, 8, %s, Filter -FIELD rawExp.exp_time, 5, %s, exptime -FIELD rawExp.airmass, 5, %s, airmass -FIELD rawExp.bg, 5, %s, bg -FIELD rawExp.bg_stdev, 5, %s, bg_stdev +FIELD rawExp.filter, 10, %s, Filter +FIELD rawExp.exp_time, 5, %.2f, exptime +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, bg +FIELD rawExp.bg_stdev, 5, %.2f, bg_stdev Index: trunk/ippMonitor/def/summitExp.d =================================================================== --- trunk/ippMonitor/def/summitExp.d (revision 18143) +++ trunk/ippMonitor/def/summitExp.d (revision 18193) @@ -8,5 +8,5 @@ FIELD camera, 5, %s, camera FIELD telescope, 5, %s, telescope -FIELD dateobs, 5, %s, date/time +FIELD dateobs, 19, %T, date/time FIELD exp_type, 5, %s, type FIELD uri, 5, %s, URI Index: trunk/ippMonitor/def/warpInputExp.d =================================================================== --- trunk/ippMonitor/def/warpInputExp.d (revision 18143) +++ trunk/ippMonitor/def/warpInputExp.d (revision 18193) @@ -18,13 +18,13 @@ FIELD warpInputExp.warp_id, 5, %s, Warp ID FIELD warpInputExp.magiced, 5, %s, magic? -FIELD rawExp.telescope, 10, %s, Telescope -FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.telescope, 8, %s, Telescope +FIELD rawExp.camera, 8, %s, Camera +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 8, %s, Object -FIELD rawExp.filter, 8, %s, Filter -FIELD rawExp.exp_time, 5, %s, exptime -FIELD rawExp.airmass, 5, %s, airmass -FIELD rawExp.bg, 5, %s, bg -FIELD rawExp.bg_stdev, 5, %s, bg_stdev +FIELD rawExp.filter, 10, %s, Filter +FIELD rawExp.exp_time, 5, %.2f, exptime +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, bg +FIELD rawExp.bg_stdev, 5, %.2f, bg_stdev Index: trunk/ippMonitor/def/warpSkycellMap.d =================================================================== --- trunk/ippMonitor/def/warpSkycellMap.d (revision 18143) +++ trunk/ippMonitor/def/warpSkycellMap.d (revision 18193) @@ -24,11 +24,11 @@ FIELD rawExp.telescope, 10, %s, Telescope FIELD rawExp.camera, 10, %s, Camera -FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.dateobs, 19, %T, Date/Time FIELD rawExp.ra, 8, %10.6f, RA, op=OP1 FIELD rawExp.decl, 8, %10.6f, DEC, op=OP2 FIELD rawExp.object, 8, %s, Object -FIELD rawExp.filter, 8, %s, Filter -FIELD rawExp.exp_time, 5, %s, exptime -FIELD rawExp.airmass, 5, %s, airmass -FIELD rawExp.bg, 5, %s, bg -FIELD rawExp.bg_stdev, 5, %s, bg_stdev +FIELD rawExp.filter, 10, %s, Filter +FIELD rawExp.exp_time, 5, %.2f, exptime +FIELD rawExp.airmass, 5, %.4f, airmass +FIELD rawExp.bg, 5, %.2f, bg +FIELD rawExp.bg_stdev, 5, %.2f, bg_stdev Index: trunk/ippMonitor/raw/ipp.css =================================================================== --- trunk/ippMonitor/raw/ipp.css (revision 18143) +++ trunk/ippMonitor/raw/ipp.css (revision 18193) @@ -112,4 +112,15 @@ } +td.list_drop { + text-align: left; + font-size: normal; + font-weight: normal; + vertical-align: top; + background: #a0a0a0; + background-color: #a0a0a0; + border: 2px solid #000000; + padding: 2px; +} + td.list_run { text-align: left; @@ -119,4 +130,37 @@ background: #ffa0a0; background-color: #ffa0a0; + border: 2px solid #000000; + padding: 2px; +} + +td.det_off { + text-align: left; + font-size: normal; + font-weight: normal; + vertical-align: top; + background: #a0a0a0; + background-color: #a0a0a0; + border: 2px solid #000000; + padding: 2px; +} + +td.det_drop { + text-align: left; + font-size: normal; + font-weight: normal; + vertical-align: top; + background: #a0a0a0; + background-color: #ffa0a0; + border: 2px solid #000000; + padding: 2px; +} + +td.det_add { + text-align: left; + font-size: normal; + font-weight: normal; + vertical-align: top; + background: #ffa0a0; + background-color: #a0a0ff; border: 2px solid #000000; padding: 2px; Index: trunk/ippMonitor/raw/ipp.php =================================================================== --- trunk/ippMonitor/raw/ipp.php (revision 18143) +++ trunk/ippMonitor/raw/ipp.php (revision 18193) @@ -315,4 +315,9 @@ $sortKey = "&sort=" . $_POST['sort']; } + if ($_SERVER[REQUEST_METHOD] == 'GET') { + $sortKey = "&rsort=" . $_GET['rsort']; + } else { + $sortKey = "&rsort=" . $_POST['rsort']; + } if ($rowStart > 0) { @@ -410,4 +415,14 @@ if ($value != "") { $where = $where . " ORDER BY $value"; + return $where; + } + if ($_SERVER[REQUEST_METHOD] == 'GET') { + $value = $_GET['rsort']; + } else { + $value = $_POST['rsort']; + } + if ($value != "") { + $where = $where . " ORDER BY $value DESC"; + return $where; } return $where; @@ -432,5 +447,5 @@ } -// for numerical fields, test for both 'min' and 'max' values +// for numerical fields, test for both 'min' and plain values function button_restrict_min ($key, $line) { $htmlkey = preg_replace ('|\.|', '_', $key); @@ -470,7 +485,50 @@ } -function write_table_header ($class, $name, $value, $buttonLink, $ID, $file) { - - $link = "$file" . "?" . $ID['link'] . "&sort=$value"; +function write_header_cell ($class, $name) { + + echo "\n"; +} + +// write a table cell with the up and down sort arrows +function write_sort_cell ($class, $value, $buttonLink, $ID, $file) { + + echo "\n"; +} + +function write_write_sort_down ($class, $name, $value, $buttonLink, $ID, $file) { + + $link = "$file" . "?" . $ID['link'] . "&rsort=$value"; if ($buttonLink != "") { $link = $link . "&$buttonLink"; @@ -483,4 +541,6 @@ function write_query_row ($key, $width, $mode) { $htmlkey = preg_replace ('|\.|', '_', $key); + + // optional bits by mode if ($mode == 'min') { $htmlkey = $htmlkey . "_min"; @@ -494,13 +554,27 @@ $value = $_POST[$htmlkey]; } - // XXX need to modify $key (should it be htmlkey here?) + + // full table element includes optionally the <= or >= words + echo "\n"; - } else { - echo "\n"; - } + echo "value=\"$value\">"; + } + echo "\n"; } function write_table_cell ($class, $format, $link, $value) { + + if ($format == '%T') { + $format = '%s'; + } + if ($format == '%t') { + $format = '%s'; + if ($value == 0) { + $value = 'N'; + } else { + $value = 'Y'; + } + } + $myValue = sprintf ($format, $value); if ($myValue == "") { $myValue = " "; } Index: trunk/ippMonitor/scripts/generate =================================================================== --- trunk/ippMonitor/scripts/generate (revision 18143) +++ trunk/ippMonitor/scripts/generate (revision 18193) @@ -228,15 +228,25 @@ sub write_table_header { - # add column sorting elements here + # print the table header (field labels) + print FILE "echo \"\\n\";\n"; for ($i = 0; $i < @field; $i++) { ($label, $value, $string) = &parse_label ($show[$i]); if ($show[$i] eq "none") { next; } - # print FILE "echo \"\\n\";\n"; + print FILE "write_header_cell (\"list\", \"$name[$i]\");\n"; + } + print FILE "echo \"\\n\";\n"; + + # print the column sort cells + print FILE "echo \"\\n\";\n"; + for ($i = 0; $i < @field; $i++) { + ($label, $value, $string) = &parse_label ($show[$i]); + if ($show[$i] eq "none") { next; } if ($label eq "op") { - print FILE "write_table_header (\"list\", \"$name[$i]\", \"$opf{$value}\", \$buttonLink, \$ID, '$myFile');\n"; + print FILE "write_sort_cell (\"list\", \"$opf{$value}\", \$buttonLink, \$ID, '$myFile');\n"; } else { - print FILE "write_table_header (\"list\", \"$name[$i]\", \"$field[$i]\", \$buttonLink, \$ID, '$myFile');\n"; - } - } + print FILE "write_sort_cell (\"list\", \"$field[$i]\", \$buttonLink, \$ID, '$myFile');\n"; + } + } + print FILE "echo \"\\n\";\n"; } @@ -248,9 +258,14 @@ # TD_CLASS class field expression - ($class, $field, $testline) = split (" ", $tdClass, 3); - - $field = &parse_fieldname ($field); - - print FILE " if ($field $testline) {\n"; + ($class, $testline) = split (" ", $tdClass, 2); + + $testlineFixed = ""; + @testlineBits = split (" ", $testline); + foreach my $bit (@testlineBits) { + $newbit = &parse_fieldname ($bit); + $testlineFixed = "$testlineFixed $newbit"; + } + + print FILE " if ($testlineFixed) {\n"; print FILE " \$class = \"$class\";\n"; print FILE " }\n"; @@ -270,4 +285,5 @@ print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'string');\n"; } else { + print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'string');\n"; print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'min');\n"; print FILE "\$WHERE = check_restrict ('$value', \$WHERE, 'max');\n"; @@ -286,4 +302,5 @@ print FILE "\$buttonLink = button_restrict_string ('$value', \$buttonLink);\n"; } else { + print FILE "\$buttonLink = button_restrict_string ('$value', \$buttonLink);\n"; print FILE "\$buttonLink = button_restrict_min ('$value', \$buttonLink);\n"; print FILE "\$buttonLink = button_restrict_max ('$value', \$buttonLink);\n"; @@ -297,5 +314,5 @@ my ($i); - print FILE "echo \"\\n\";\n"; + print FILE "echo \"\\n\";\n"; for ($i = 0; $i < @field; $i++) { if ($show[$i] eq "none") { next; } @@ -311,5 +328,5 @@ } } - print FILE "echo \"\\n\";\n"; + print FILE "echo \"\\n\";\n"; for ($i = 0; $i < @field; $i++) { if ($show[$i] eq "none") { next; } @@ -347,4 +364,10 @@ # print the actual table cell line with the link... if (! $value && ($field[$i] ne "*")) { $value = "\$row[$Nrow]"; } + + # add special format elements + # $realFormat = $format[$i]; + # if ($format[$i] eq '%T') { + # $realFormat = '%s'; + # } print FILE " write_table_cell (\$class, '$format[$i]', $myLink, $value);\n"; next; @@ -557,4 +580,5 @@ foreach $word (@words) { $fword = &parse_fieldname ($word); + # print "field: $word -> $fword\n"; push @outwords, $fword; if ($word =~ m|^\$|) {
$name"; + + // base link + $baselink = "$file" . "?" . $ID['link']; + if ($buttonLink != "") { + $baselink = $baselink . "&$buttonLink"; + } + + if ($_SERVER[REQUEST_METHOD] == 'GET') { + $up = $_GET['sort']; + $down = $_GET['rsort']; + } else { + $up = $_POST['sort']; + $down = $_POST['rsort']; + } + + // up button link + $link = "$baselink" . "&sort=$value"; + if ($up == $value) { + echo ""; + } else { + echo ""; + } + + // down button link + $link = "$baselink" . "&rsort=$value"; + if ($down == $value) { + echo ""; + } else { + echo ""; + } + + echo "
$name[$i]
&ge
&le