Index: trunk/ippMonitor/def/camPendingExp.d =================================================================== --- trunk/ippMonitor/def/camPendingExp.d (revision 15784) +++ trunk/ippMonitor/def/camPendingExp.d (revision 15954) @@ -10,19 +10,19 @@ ARGS ARG1 chipRun.exp_id=$chipRun.exp_id -# field size name show link to extras -FIELD camRun.cam_id, 5, chip ID, value, chipProcessedExp.php, ARG1 -FIELD chipRun.chip_id, 5, cam ID -FIELD chipRun.exp_id, 5, exposure ID, value, chipProcessedImfile.php, ARG1 -FIELD rawExp.exp_name, 5, Exp Name, value, rawImfile.php, ARG1 -FIELD rawExp.telescope, 10, Telescope -FIELD rawExp.camera, 10, Camera -FIELD rawExp.dateobs, 20, Date/Time -FIELD rawExp.filter, 10, FILTER -FIELD rawExp.ra, 5, RA -FIELD rawExp.decl, 5, Dec -FIELD rawExp.exp_time, 5, exp_time -FIELD rawExp.sat_pixel_frac, 5, f(sat pixels) -FIELD rawExp.airmass, 5, airmass -FIELD rawExp.bg, 5, backgnd -FIELD rawExp.bg_stdev, 5, stdev -FIELD rawExp.bg_mean_stdev, 5, <backgnd> +# field size format name show link to extras +FIELD camRun.cam_id, 5, %s, chip ID, value, chipProcessedExp.php, ARG1 +FIELD chipRun.chip_id, 5, %s, cam ID +FIELD chipRun.exp_id, 5, %s, exposure ID, value, chipProcessedImfile.php, ARG1 +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.ra, 5, %s, RA +FIELD rawExp.decl, 5, %s, Dec +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> Index: trunk/ippMonitor/def/camProcessedExp.d =================================================================== --- trunk/ippMonitor/def/camProcessedExp.d (revision 15784) +++ trunk/ippMonitor/def/camProcessedExp.d (revision 15954) @@ -23,27 +23,27 @@ ARGS ARG2 basename=$camProcessedExp.path_base -# field size name show link to extras -FIELD rawExp.exp_name, 5, Exp Name, value, rawImfile.php, ARG1 -FIELD chipRun.exp_id, 5, Exp ID, value, chipProcessedImfile.php, ARG1 -FIELD chipRun.chip_id, 5, chip ID -FIELD camRun.cam_id, 5, cam ID, value, chipProcessedExp.php, ARG1 -FIELD *, 8, image, image=JPEG2, camProcessedImfile.php, ARG2 -FIELD rawExp.telescope, 10, Telescope -FIELD rawExp.camera, 10, Camera -FIELD rawExp.dateobs, 20, Date/Time -FIELD rawExp.filter, 10, FILTER -FIELD rawExp.ra, 5, RA -FIELD rawExp.decl, 5, Dec -FIELD rawExp.exp_time, 5, exp_time -FIELD rawExp.sat_pixel_frac, 5, f(sat pixels) -FIELD rawExp.airmass, 5, airmass -FIELD camRun.reduction, 5, reduction -FIELD camProcessedExp.bg, 5, backgnd -FIELD camProcessedExp.bg_stdev, 5, stdev -FIELD camProcessedExp.bg_mean_stdev, 5, <backgnd> -FIELD camProcessedExp.n_stars, 5, Nstars -FIELD camProcessedExp.n_astrom, 5, Nastrom -FIELD camProcessedExp.sigma_ra, 5, sigma ra -FIELD camProcessedExp.fwhm, 5, FHWM -FIELD camProcessedExp.path_base, 5, path_base, none -FIELD rawExp.exp_id, 5, Exp ID, none +# field size format name show link to extras +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD chipRun.exp_id, 5, %s, Exp ID, value, chipProcessedImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %s, chip ID +FIELD camRun.cam_id, 5, %s, 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.filter, 10, %s, FILTER +FIELD rawExp.ra, 5, %s, RA +FIELD rawExp.decl, 5, %s, Dec +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 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, 5, %s, FHWM +FIELD camProcessedExp.path_base, 5, %s, path_base, none +FIELD rawExp.exp_id, 5, %s, Exp ID, none Index: trunk/ippMonitor/def/camProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/camProcessedImfile.d (revision 15784) +++ trunk/ippMonitor/def/camProcessedImfile.d (revision 15954) @@ -12,18 +12,18 @@ WHERE chipProcessedImfile.chip_id = camRun.chip_id -# field size name show link to extras -FIELD camRun.cam_id, 5, cam ID, value -FIELD chipRun.chip_id, 5, chip ID -FIELD rawExp.exp_id, 5, exposure ID, value -FIELD rawExp.exp_name, 5, Exp Name, value -FIELD rawExp.telescope, 10, Telescope -FIELD rawExp.camera, 10, Camera -FIELD chipProcessedImfile.bg, 5, backgnd -FIELD chipProcessedImfile.bg_stdev, 5, stdev -FIELD chipProcessedImfile.bg_mean_stdev, 5, <backgnd> -FIELD chipProcessedImfile.n_stars, 5, Nstars -FIELD chipProcessedImfile.n_astrom, 5, Nastrom -FIELD chipProcessedImfile.sigma_ra, 5, sigma ra -FIELD chipProcessedImfile.fwhm, 5, FHWM +# field size format name show link to extras +FIELD camRun.cam_id, 5, %s, cam ID, value +FIELD chipRun.chip_id, 5, %s, chip ID +FIELD rawExp.exp_id, 5, %s, exposure ID, value +FIELD rawExp.exp_name, 5, %s, Exp Name, value +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD chipProcessedImfile.bg, 5, %s, backgnd +FIELD chipProcessedImfile.bg_stdev, 5, %s, stdev +FIELD chipProcessedImfile.bg_mean_stdev, 5, %s, <backgnd> +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, 5, %s, FHWM TAIL PHP insert_image ('PPIMAGE.JPEG1'); Index: trunk/ippMonitor/def/chipPendingExp.d =================================================================== --- trunk/ippMonitor/def/chipPendingExp.d (revision 15784) +++ trunk/ippMonitor/def/chipPendingExp.d (revision 15954) @@ -9,20 +9,24 @@ ARGS ARG1 exp_id=$chipRun.exp_id -# field size name show link to extras -FIELD chipRun.chip_id, 7, chip ID -FIELD chipRun.exp_id, 5, Exp ID -FIELD rawExp.exp_name, 5, Exp Name, value, rawImfile.php, ARG1 -FIELD rawExp.telescope, 10, Telescope -FIELD rawExp.camera, 10, Camera -FIELD rawExp.dateobs, 20, Date/Time -FIELD rawExp.filter, 10, FILTER -FIELD rawExp.ra, 5, RA -FIELD rawExp.decl, 5, Dec -FIELD rawExp.exp_time, 5, exp_time -FIELD rawExp.sat_pixel_frac, 5, f(sat pixels) -FIELD rawExp.airmass, 5, airmass -FIELD rawExp.bg, 5, backgnd -FIELD rawExp.bg_stdev, 5, stdev -FIELD rawExp.bg_mean_stdev, 5, <backgnd> +OP OP1 $rawExp.ra * 57.295783 +OP OP2 $rawExp.decl * 57.295783 + +# field size format name show link to extras +FIELD chipRun.chip_id, 7, %s, chip ID +FIELD chipRun.exp_id, 5, %s, Exp ID +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.ra, 5, %10.6f, RA, op=OP1 +FIELD rawExp.decl, 5, %10.6f, DEC, op=OP2 +FIELD rawExp.exp_time, 5, %s, exp_time +FIELD rawExp.sat_pixel_frac, 5, %6.4f, f(sat pixels) +FIELD rawExp.airmass, 5, %s, airmass +FIELD rawExp.bg, 5, %8.2f, backgnd +FIELD rawExp.bg_stdev, 5, %7.2f, stdev +FIELD rawExp.bg_mean_stdev, 5, %7.2f, <backgnd> +FIELD rawExp.comment, 5, %s, CMMTOBS Index: trunk/ippMonitor/def/chipPendingImfile.d =================================================================== --- trunk/ippMonitor/def/chipPendingImfile.d (revision 15784) +++ trunk/ippMonitor/def/chipPendingImfile.d (revision 15954) @@ -4,9 +4,9 @@ MENU ipp.imfiles.dat -# field size name show link to extras -FIELD exp_id, 5, Exp ID -FIELD class_id, 5, Class ID -FIELD uri, 5, URI -FIELD recipe, 5, recipe -FIELD guide_version, 5, guide version -FIELD chip_version, 5, chip version +# field size format name show link to extras +FIELD exp_id, 5, %s, Exp ID +FIELD class_id, 5, %s, Class ID +FIELD uri, 5, %s, URI +FIELD recipe, 5, %s, recipe +FIELD guide_version, 5, %s, guide version +FIELD chip_version, 5, %s, chip version Index: trunk/ippMonitor/def/chipProcessedExp.d =================================================================== --- trunk/ippMonitor/def/chipProcessedExp.d (revision 15784) +++ trunk/ippMonitor/def/chipProcessedExp.d (revision 15954) @@ -11,20 +11,20 @@ ARGS ARG2 chipRun.chip_id=$chipRun.chip_id -# field size name show link to extras -FIELD chipRun.chip_id, 7, chip ID -FIELD chipRun.exp_id, 5, Exp ID, value, rawImfile.php, ARG1 -FIELD rawExp.exp_name, 5, Exp Name, value, chipProcessedImfile.php, ARG2 -FIELD rawExp.telescope, 10, Telescope -FIELD rawExp.camera, 10, Camera -FIELD rawExp.dateobs, 20, Date/Time -FIELD rawExp.filter, 10, FILTER -FIELD rawExp.ra, 5, RA -FIELD rawExp.decl, 5, Dec -FIELD rawExp.exp_time, 5, exp_time -FIELD rawExp.sat_pixel_frac, 5, f(sat pixels) -FIELD rawExp.airmass, 5, airmass -FIELD rawExp.bg, 5, backgnd -FIELD rawExp.bg_stdev, 5, stdev -FIELD rawExp.bg_mean_stdev, 5, <backgnd> +# field size format name show link to extras +FIELD chipRun.chip_id, 7, %s, chip ID +FIELD chipRun.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.ra, 5, %s, RA +FIELD rawExp.decl, 5, %s, Dec +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 chipPendingExp.reduction, 20, reduction Index: trunk/ippMonitor/def/chipProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/chipProcessedImfile.d (revision 15784) +++ trunk/ippMonitor/def/chipProcessedImfile.d (revision 15954) @@ -5,5 +5,4 @@ # limit this table to non-OBJECT types of images -WHERE chipRun.state = 'stop' WHERE chipRun.exp_id = rawExp.exp_id WHERE chipProcessedImfile.exp_id = chipRun.exp_id @@ -17,30 +16,28 @@ ARGS ARG2 class=$chipProcessedImfile.class_id -# field size name show link to extras -FIELD chipRun.chip_id, 7, chip ID -FIELD chipRun.exp_id, 5, Exp ID, value, rawImfile.php, ARG1 -FIELD chipProcessedImfile.class_id, 5, Class ID -FIELD rawExp.exp_name, 5, Exp Name, value, chipProcessedImfile.php, ARG2 -FIELD rawExp.telescope, 10, Telescope -FIELD rawExp.camera, 10, Camera -FIELD rawExp.dateobs, 20, Date/Time -FIELD rawExp.filter, 10, FILTER -FIELD rawExp.ra, 5, RA -FIELD rawExp.decl, 5, Dec -FIELD rawExp.exp_time, 5, exp_time -FIELD rawExp.sat_pixel_frac, 5, f(sat pixels) -FIELD rawExp.airmass, 5, airmass -FIELD chipProcessedImfile.bg, 5, backgnd -FIELD chipProcessedImfile.bg_stdev, 5, stdev -FIELD chipProcessedImfile.bg_mean_stdev, 5, <backgnd> - -FIELD chipProcessedImfile.n_stars, 5, Nstars -FIELD chipProcessedImfile.n_astrom, 5, Nastrom -FIELD chipProcessedImfile.sigma_ra, 5, sigma ra -FIELD chipProcessedImfile.fwhm, 5, FHWM -FIELD chipProcessedImfile.path_base, 5, path_base, none - -# FIELD chipPendingExp.reduction, 20, reduction -# FIELD chipPendingExp.guide_id, 20, guide ID +# field size format name show link to extras +FIELD chipRun.chip_id, 7, %s, chip ID +FIELD chipRun.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD chipProcessedImfile.class_id, 5, %s, Class ID +FIELD rawExp.exp_name, 5, %s, Exp Name, value, chipProcessedImfile.php, ARG2 +FIELD rawExp.telescope, 10, %s, Telescope +FIELD rawExp.camera, 10, %s, Camera +FIELD rawExp.dateobs, 20, %s, Date/Time +FIELD rawExp.filter, 10, %s, FILTER +FIELD rawExp.ra, 5, %s, RA +FIELD rawExp.decl, 5, %s, Dec +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 chipProcessedImfile.bg, 5, %s, backgnd +FIELD chipProcessedImfile.bg_stdev, 5, %s, stdev +FIELD chipProcessedImfile.bg_mean_stdev, 5, %s, <backgnd> +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, 5, %s, FHWM +FIELD chipProcessedImfile.path_base, 5, %s, path_base, none +# FIELD chipPendingExp.reduction, 20, %s, reduction +# FIELD chipPendingExp.guide_id, 20, %s, guide ID TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/detInputExp.d =================================================================== --- trunk/ippMonitor/def/detInputExp.d (revision 15784) +++ trunk/ippMonitor/def/detInputExp.d (revision 15954) @@ -21,21 +21,21 @@ HEAD PHP echo " proc "; } -# field width name show link to extras -FIELD detInputExp.det_id, 7, Det ID -FIELD detInputExp.iteration, 5, iteration -FIELD detInputExp.exp_id, 5, Exp ID, value, rawImfile.php, ARG1 -FIELD rawExp.exp_name, 5, Exp Name, value, rawImfile.php, ARG1 -FIELD detInputExp.include, 7, include -FIELD rawExp.telescope, 10, Telescope -FIELD rawExp.camera, 10, Camera -FIELD rawExp.exp_type, 10, Type -FIELD rawExp.filter, 10, FILTER -FIELD rawExp.dateobs, 20, Date/Time -FIELD rawExp.exp_time, 5, exp_time -FIELD rawExp.sat_pixel_frac, 5, f(sat pixels) -FIELD rawExp.airmass, 5, airmass -FIELD rawExp.bg, 5, backgnd -FIELD rawExp.bg_stdev, 5, stdev -FIELD rawExp.bg_mean_stdev, 5, <backgnd> -FIELD *, 5, choose, value=resid, detResidImfile.php, ARG2 -FIELD *, 5, choose, value=proc, detProcessedImfile.php, ARG3 +# field size format name show link to extras +FIELD detInputExp.det_id, 7, %s, Det ID +FIELD detInputExp.iteration, 5, %s, iteration +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 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 *, 5, %s, choose, value=resid, detResidImfile.php, ARG2 +FIELD *, 5, %s, choose, value=proc, detProcessedImfile.php, ARG3 Index: trunk/ippMonitor/def/detMasterFrame.d =================================================================== --- trunk/ippMonitor/def/detMasterFrame.d (revision 15784) +++ trunk/ippMonitor/def/detMasterFrame.d (revision 15954) @@ -4,6 +4,6 @@ MENU ipp.detrend.dat -# field name show link to extras -FIELD det_id, 20, det_id -FIELD iteration, 20, iteration -FIELD comment, 20, comment +# field size format name show link to extras +FIELD det_id, 20, %s, det_id +FIELD iteration, 20, %s, iteration +FIELD comment, 20, %s, comment Index: trunk/ippMonitor/def/detMasterImfile.d =================================================================== --- trunk/ippMonitor/def/detMasterImfile.d (revision 15784) +++ trunk/ippMonitor/def/detMasterImfile.d (revision 15954) @@ -4,7 +4,7 @@ MENU ipp.imfiles.dat -# field name show link to extras -FIELD det_id, 20, det_id -FIELD class_id, 20, class_id -FIELD uri, 20, uri -FIELD recipe, 20, recipe +# field size format name show link to extras +FIELD det_id, 20, %s, det_id +FIELD class_id, 20, %s, class_id +FIELD uri, 20, %s, uri +FIELD recipe, 20, %s, recipe Index: trunk/ippMonitor/def/detNormalizedExp.d =================================================================== --- trunk/ippMonitor/def/detNormalizedExp.d (revision 15784) +++ trunk/ippMonitor/def/detNormalizedExp.d (revision 15954) @@ -17,11 +17,11 @@ ARGS ARG2 camera=$detRun.camera -# field size name show link to extras -FIELD detNormalizedExp.det_id, 7, det_id -FIELD detNormalizedExp.bg, 8, backgnd -FIELD detNormalizedExp.bg_mean_stdev, 8, [stdev] -FIELD detNormalizedExp.bg_stdev, 8, stdev -FIELD detNormalizedExp.iteration, 5, iteration -FIELD *, 8, image, image=JPEG2, detNormalizedImfile.php, ARG2 -FIELD detNormalizedExp.path_base, 20, path_base, none -FIELD detRun.camera, 20, camera, none +# field size format name show link to extras +FIELD detNormalizedExp.det_id, 7, %s, det_id +FIELD detNormalizedExp.bg, 8, %s, backgnd +FIELD detNormalizedExp.bg_mean_stdev, 8, %s, [stdev] +FIELD detNormalizedExp.bg_stdev, 8, %s, stdev +FIELD detNormalizedExp.iteration, 5, %s, iteration +FIELD *, 8, %s, image, image=JPEG2, detNormalizedImfile.php, ARG2 +FIELD detNormalizedExp.path_base, 20, %s, path_base, none +FIELD detRun.camera, 20, %s, camera, none Index: trunk/ippMonitor/def/detNormalizedImfile.d =================================================================== --- trunk/ippMonitor/def/detNormalizedImfile.d (revision 15784) +++ trunk/ippMonitor/def/detNormalizedImfile.d (revision 15954) @@ -4,13 +4,13 @@ MENU ipp.imfiles.dat -# field size name show link to extras -FIELD det_id, 7, det_id -FIELD class_id, 8, class_id -FIELD bg, 8, backgnd -FIELD bg_stdev, 8, stdev -FIELD bg_mean_stdev, 8, [stdev] -FIELD iteration, 5, iteration -#FIELD uri, 20, uri -#FIELD path_base, 20, path_base +# field size format name show link to extras +FIELD det_id, 7, %s, det_id +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 iteration, 5, %s, iteration +#FIELD uri, 20, %s, uri +#FIELD path_base, 20, %s, path_base TAIL PHP insert_image ('PPIMAGE.JPEG1'); Index: trunk/ippMonitor/def/detNormalizedStatImfile.d =================================================================== --- trunk/ippMonitor/def/detNormalizedStatImfile.d (revision 15784) +++ trunk/ippMonitor/def/detNormalizedStatImfile.d (revision 15954) @@ -4,7 +4,7 @@ MENU ipp.imfiles.dat -# field name show link to extras -FIELD det_id, 7, det_id -FIELD class_id, 8, class_id -FIELD iteration, 5, iteration -FIELD norm, 5, norm +# field size format name show link to extras +FIELD det_id, 7, %s, det_id +FIELD class_id, 8, %s, class_id +FIELD iteration, 5, %s, iteration +FIELD norm, 5, %s, norm Index: trunk/ippMonitor/def/detProcessedExp.d =================================================================== --- trunk/ippMonitor/def/detProcessedExp.d (revision 15784) +++ trunk/ippMonitor/def/detProcessedExp.d (revision 15954) @@ -18,20 +18,20 @@ OP OP1 $detProcessedExp.bg / $detProcessedExp.bg_stdev -# field size name show link to extras -FIELD detProcessedExp.det_id, 7, Det ID, value -FIELD rawExp.camera, 10, camera, value -FIELD detProcessedExp.exp_id, 5, Exp ID, value -FIELD rawExp.exp_name, 5, Exp Name, value -FIELD *, 8, image, image=JPEG2, detProcessedImfile.php, ARG1 -FIELD detProcessedExp.bg, 8, backgnd, value -FIELD detProcessedExp.bg_mean_stdev, 8, [stdev], value -FIELD detProcessedExp.bg_stdev, 8, stdev, value -FIELD *, 8, S/N, op=OP1 -FIELD rawExp.dateobs, 8, obs date, value -FIELD rawExp.filter, 8, filter, value -FIELD rawExp.exp_time, 8, exptime, value -FIELD rawExp.ccd_temp, 8, ccd temp, value -FIELD rawExp.airmass, 8, airmass, value -FIELD detProcessedExp.path_base, 20, path_base, none +# field size format name show link to extras +FIELD detProcessedExp.det_id, 7, %s, Det ID, value +FIELD rawExp.camera, 10, %s, camera, value +FIELD detProcessedExp.exp_id, 5, %s, Exp ID, value +FIELD rawExp.exp_name, 5, %s, Exp Name, 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.path_base, 20, %s, path_base, none # note: you must include all desired fields, where ever they are used, Index: trunk/ippMonitor/def/detProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/detProcessedImfile.d (revision 15784) +++ trunk/ippMonitor/def/detProcessedImfile.d (revision 15954) @@ -7,13 +7,13 @@ WHERE detProcessedImfile.exp_id = rawExp.exp_id -# field size name show link to extras -FIELD detProcessedImfile.det_id, 7, Det ID -FIELD detProcessedImfile.exp_id, 5, Exp ID -FIELD rawExp.exp_name, 5, Exp Name -FIELD detProcessedImfile.class_id, 8, Chip ID -FIELD detProcessedImfile.bg, 8, backgnd -FIELD detProcessedImfile.bg_stdev, 8, stdev -FIELD detProcessedImfile.bg_mean_stdev, 8, [stdev] -FIELD detProcessedImfile.path_base, 5, path_base +# field size format name show link to extras +FIELD detProcessedImfile.det_id, 7, %s, Det ID +FIELD detProcessedImfile.exp_id, 5, %s, Exp ID +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD detProcessedImfile.class_id, 8, %s, Chip ID +FIELD detProcessedImfile.bg, 8, %s, backgnd +FIELD detProcessedImfile.bg_stdev, 8, %s, stdev +FIELD detProcessedImfile.bg_mean_stdev, 8, %s, [stdev] +FIELD detProcessedImfile.path_base, 5, %s, path_base TAIL PHP insert_image ('PPIMAGE.JPEG1'); Index: trunk/ippMonitor/def/detResidExp.d =================================================================== --- trunk/ippMonitor/def/detResidExp.d (revision 15784) +++ trunk/ippMonitor/def/detResidExp.d (revision 15954) @@ -22,29 +22,29 @@ OP OP1 $detResidExp.bg / $detResidExp.bin_stdev -# field size name show link to linkargs -FIELD detResidExp.det_id, 7, Det ID, value -FIELD rawExp.camera, 10, camera, value -FIELD detResidExp.exp_id, 5, Exp ID, value, rawImfile.php, ARG1 -FIELD rawExp.exp_name, 5, Exp Name, value, rawImfile.php, ARG1 -FIELD detResidExp.iteration, 5, iter, value -FIELD *, 8, image, image=JPEG2, detResidImfile.php, ARG2 -FIELD detResidExp.bg, 8, backgnd, value -FIELD detResidExp.bg_mean_stdev, 8, [stdev] -FIELD detResidExp.bg_stdev, 8, stdev, value -FIELD detResidExp.bin_stdev, 8, bin stdev, value -FIELD *, 8, S/N, op=OP1 -FIELD detResidExp.fringe_0, 8, fringe, value -FIELD detResidExp.fringe_1, 8, fringe err, value -FIELD detResidExp.fringe_2, 8, fringe stdev, value -FIELD detResidExp.user_1, 8, dfringe, value -FIELD detResidExp.user_2, 8, dfringe err, value -FIELD detResidExp.user_3, 8, dfringe stdev, value -FIELD rawExp.dateobs, 8, obs date, value -FIELD rawExp.filter, 8, filter, value -FIELD rawExp.exp_time, 8, exptime, value -FIELD rawExp.ccd_temp, 8, ccd temp, value -FIELD rawExp.airmass, 8, airmass, value -FIELD detResidExp.accept, 4, keep, value -FIELD detResidExp.path_base, 20, path_base, none +# field size format name show link to linkargs +FIELD detResidExp.det_id, 7, %s, Det ID, value +FIELD rawExp.camera, 10, %s, camera, value +FIELD detResidExp.exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD rawExp.exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD detResidExp.iteration, 5, %s, iter, 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 *, 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.path_base, 20, %s, path_base, none TD_CLASS list_off $detResidExp.accept == 0 Index: trunk/ippMonitor/def/detResidImfile.d =================================================================== --- trunk/ippMonitor/def/detResidImfile.d (revision 15784) +++ trunk/ippMonitor/def/detResidImfile.d (revision 15954) @@ -7,14 +7,14 @@ WHERE detResidImfile.exp_id = rawExp.exp_id -# field size name show link to extras -FIELD detResidImfile.det_id, 7, Det ID -FIELD detResidImfile.exp_id, 5, Exp ID -FIELD rawExp.exp_name, 5, Exp Name -FIELD detResidImfile.class_id, 8, Chip ID -FIELD detResidImfile.bg, 8, backgnd -FIELD detResidImfile.bg_stdev, 8, bg stdev -FIELD detResidImfile.bg_mean_stdev, 8, [stdev] -FIELD detResidImfile.iteration, 5, iter -FIELD detResidImfile.path_base, 5, path_base +# field size format name show link to extras +FIELD detResidImfile.det_id, 7, %s, Det ID +FIELD detResidImfile.exp_id, 5, %s, Exp ID +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD detResidImfile.class_id, 8, %s, Chip ID +FIELD detResidImfile.bg, 8, %s, backgnd +FIELD detResidImfile.bg_stdev, 8, %s, bg stdev +FIELD detResidImfile.bg_mean_stdev, 8, %s, [stdev] +FIELD detResidImfile.iteration, 5, %s, iter +FIELD detResidImfile.path_base, 5, %s, path_base TAIL PHP insert_image ('PPIMAGE.JPEG1'); Index: trunk/ippMonitor/def/detRun.d =================================================================== --- trunk/ippMonitor/def/detRun.d (revision 15784) +++ trunk/ippMonitor/def/detRun.d (revision 15954) @@ -14,25 +14,25 @@ ARGS ARG4 detResidExp.iteration=$iteration -# field width name show link to extras -FIELD det_id, 5, det ID, value, detRunSummary.php, ARG1 -FIELD iteration, 3, iter -FIELD det_type, 5, type -FIELD state, 5, state -FIELD *, 5, choose, value=input, detInputExp.php, ARG2 -FIELD *, 5, choose, value=proc, detProcessedExp.php, ARG3 -FIELD *, 5, choose, value=resid, detResidExp.php, ARG4 -FIELD mode, 5, mode -FIELD filter, 10, filter -FIELD airmass_min, 10, min airmass -FIELD airmass_max, 5, max -FIELD exp_time_min, 10, min exp_time -FIELD exp_time_max, 5, max -FIELD ccd_temp_min, 10, min ccd_temp -FIELD ccd_temp_max, 5, max -FIELD posang_min, 10, min posang -FIELD posang_max, 5, max -FIELD registered, 10, registered -FIELD use_begin, 10, use_begin -FIELD use_end, 10, use_end +# field size format name show link to extras +FIELD det_id, 5, %s, det ID, value, detRunSummary.php, ARG1 +FIELD iteration, 3, %s, iter +FIELD det_type, 5, %s, type +FIELD state, 5, %s, state +FIELD *, 5, %s, choose, value=input, detInputExp.php, ARG2 +FIELD *, 5, %s, choose, value=proc, detProcessedExp.php, ARG3 +FIELD *, 5, %s, choose, value=resid, detResidExp.php, ARG4 +FIELD mode, 5, %s, mode +FIELD filter, 10, %s, filter +FIELD airmass_min, 10, %s, min airmass +FIELD airmass_max, 5, %s, max +FIELD exp_time_min, 10, %s, min exp_time +FIELD exp_time_max, 5, %s, max +FIELD ccd_temp_min, 10, %s, min ccd_temp +FIELD ccd_temp_max, 5, %s, max +FIELD posang_min, 10, %s, min posang +FIELD posang_max, 5, %s, max +FIELD registered, 10, %s, registered +FIELD use_begin, 10, %s, use_begin +FIELD use_end, 10, %s, use_end TD_CLASS list_off $state == 'drop' Index: trunk/ippMonitor/def/detRunSummary.d =================================================================== --- trunk/ippMonitor/def/detRunSummary.d (revision 15784) +++ trunk/ippMonitor/def/detRunSummary.d (revision 15954) @@ -12,14 +12,14 @@ ARGS ARG2 detResidExp.iteration=$detRunSummary.iteration -# field name show link to extras -FIELD detRunSummary.det_id, 7, det_id -FIELD detRunSummary.iteration, 5, iter -FIELD detRunSummary.accept, 4, keep -FIELD *, 20, choose, value=input, detInputExp.php, ARG1 -FIELD *, 20, choose, value=proc, detProcessedExp.php, ARG3 -FIELD *, 20, choose, value=resid, detResidExp.php, ARG2 -FIELD detRunSummary.bg, 20, bg -FIELD detRunSummary.bg_stdev, 20, bg_stdev -FIELD detRun.state, 20, state, none +# field size format name show link to extras +FIELD detRunSummary.det_id, 7, %s, det_id +FIELD detRunSummary.iteration, 5, %s, iter +FIELD detRunSummary.accept, 4, %s, keep +FIELD *, 20, %s, choose, value=input, detInputExp.php, ARG1 +FIELD *, 20, %s, choose, value=proc, detProcessedExp.php, ARG3 +FIELD *, 20, %s, choose, value=resid, detResidExp.php, ARG2 +FIELD detRunSummary.bg, 20, %s, bg +FIELD detRunSummary.bg_stdev, 20, %s, bg_stdev +FIELD detRun.state, 20, %s, state, none TD_CLASS list_off $detRun.state == 'drop' Index: trunk/ippMonitor/def/detStackedImfile.d =================================================================== --- trunk/ippMonitor/def/detStackedImfile.d (revision 15784) +++ trunk/ippMonitor/def/detStackedImfile.d (revision 15954) @@ -4,11 +4,11 @@ MENU ipp.imfiles.dat -# field name show link to extras -FIELD det_id, 7, det_id -FIELD class_id, 8, class_id -FIELD bg, 8, backgnd -FIELD bg_stdev, 8, stdev -FIELD bg_mean_stdev, 8, [stdev] -FIELD iteration, 5, iteration +# field size format name show link to extras +FIELD det_id, 7, %s, det_id +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 iteration, 5, %s, iteration # FIELD uri, 20, uri # FIELD recipe, 20, recipe Index: trunk/ippMonitor/def/diffInputSkyfile.d =================================================================== --- trunk/ippMonitor/def/diffInputSkyfile.d (revision 15784) +++ trunk/ippMonitor/def/diffInputSkyfile.d (revision 15954) @@ -4,9 +4,9 @@ MENU ipp.diff.dat -# field name show link to extras -FIELD diff_id, 20, diff ID -FIELD warp_id, 20, warp ID -FIELD skycell_id, 20, skycell ID -FIELD tess_id, 20, tessellation ID -FIELD kind, 20, Kind -FIELD template, 20, Template? +# field size format name show link to extras +FIELD diff_id, 20, %s, diff ID +FIELD warp_id, 20, %s, warp ID +FIELD skycell_id, 20, %s, skycell ID +FIELD tess_id, 20, %s, tessellation ID +FIELD kind, 20, %s, Kind +FIELD template, 20, %s, Template? Index: trunk/ippMonitor/def/diffRun.d =================================================================== --- trunk/ippMonitor/def/diffRun.d (revision 15784) +++ trunk/ippMonitor/def/diffRun.d (revision 15954) @@ -4,10 +4,10 @@ MENU ipp.diff.dat -# field name show link to extras -FIELD diff_id, 20, diff ID -FIELD state, 20, state -FIELD workdir, 20, workdir -FIELD dvodb, 20, DVO database -FIELD registered, 20, Time registered -FIELD skycell_id, 20, skycell ID -FIELD tess_id, 20, tessellation ID +# field size format name show link to extras +FIELD diff_id, 20, %s, diff ID +FIELD state, 20, %s, state +FIELD workdir, 20, %s, workdir +FIELD dvodb, 20, %s, DVO database +FIELD registered, 20, %s, Time registered +FIELD skycell_id, 20, %s, skycell ID +FIELD tess_id, 20, %s, tessellation ID Index: trunk/ippMonitor/def/diffSkyfile.d =================================================================== --- trunk/ippMonitor/def/diffSkyfile.d (revision 15784) +++ trunk/ippMonitor/def/diffSkyfile.d (revision 15954) @@ -4,7 +4,7 @@ MENU ipp.diff.dat -# field name show link to extras -FIELD diff_id, 20, diff ID -FIELD uri, 20, URI -FIELD bg, 20, background -FIELD bg_stdev, 20, standard deviation +# field size format name show link to extras +FIELD diff_id, 20, %s, diff ID +FIELD uri, 20, %s, URI +FIELD bg, 20, %s, background +FIELD bg_stdev, 20, %s, standard deviation Index: trunk/ippMonitor/def/example.d =================================================================== --- trunk/ippMonitor/def/example.d (revision 15784) +++ trunk/ippMonitor/def/example.d (revision 15954) @@ -15,12 +15,12 @@ ARGS ARG1 iteration=$detRunSummary.iteration -# field width name show link to extras -FIELD detRunSummary.det_id, 7, det_id -FIELD detRun.det_type, 5, type -FIELD detRunSummary.iteration, 5, iter -FIELD *, 20, choose, value=input, detInputExp.php, ARG1 -FIELD *, 20, choose, value=resid, detResidExp.php, ARG1 -FIELD detRunSummary.bg, 20, bg -FIELD detRunSummary.bg_stdev, 20, bg_stdev +# field width format name show link to extras +FIELD detRunSummary.det_id, 7, %s, det_id +FIELD detRun.det_type, 5, %s, type +FIELD detRunSummary.iteration, 5, %s, iter +FIELD *, 20, %s, choose, value=input, detInputExp.php, ARG1 +FIELD *, 20, %s, choose, value=resid, detResidExp.php, ARG1 +FIELD detRunSummary.bg, 20, %s, bg +FIELD detRunSummary.bg_stdev, 20, %s, bg_stdev # FIELD bg_mean_stdev, 20, bg_mean_stdev Index: trunk/ippMonitor/def/guidePendingExp.d =================================================================== --- trunk/ippMonitor/def/guidePendingExp.d (revision 15784) +++ trunk/ippMonitor/def/guidePendingExp.d (revision 15954) @@ -6,7 +6,7 @@ ARGS ARG1 exp_id=$exp_id -# field size name show link to extras -FIELD exp_id, 5, Exp ID, value, rawImfile.php, ARG1 -FIELD exp_name, 5, Exp Name, value, rawImfile.php, ARG1 -FIELD recipe, 5, recipe -FIELD guide_version, 5, guide version +# field size format name show link to extras +FIELD exp_id, 5, %s, Exp ID, value, rawImfile.php, ARG1 +FIELD exp_name, 5, %s, Exp Name, value, rawImfile.php, ARG1 +FIELD recipe, 5, %s, recipe +FIELD guide_version, 5, %s, guide version Index: trunk/ippMonitor/def/keptDetrendFrames.d =================================================================== --- trunk/ippMonitor/def/keptDetrendFrames.d (revision 15784) +++ trunk/ippMonitor/def/keptDetrendFrames.d (revision 15954) @@ -23,14 +23,14 @@ ARGS ARG4 detResidExp.iteration=$detRunSummary.iteration -# field width name show link to extras -FIELD detRunSummary.det_id, 5, det ID, value, detRunSummary.php, ARG1 -FIELD detRunSummary.iteration, 3, iter -FIELD detRun.det_type, 5, type -FIELD detRun.state, 5, state -FIELD *, 20, choose, value=input, detInputExp.php, ARG2 -FIELD *, 20, choose, value=proc, detProcessedExp.php, ARG3 -FIELD *, 20, choose, value=resid, detResidExp.php, ARG4 -FIELD detRunSummary.bg, 20, bg -FIELD detRunSummary.bg_stdev, 20, bg_stdev +# field width format name show link to extras +FIELD detRunSummary.det_id, 5, %s, det ID, value, detRunSummary.php, ARG1 +FIELD detRunSummary.iteration, 3, %s, iter +FIELD detRun.det_type, 5, %s, type +FIELD detRun.state, 5, %s, state +FIELD *, 20, %s, choose, value=input, detInputExp.php, ARG2 +FIELD *, 20, %s, choose, value=proc, detProcessedExp.php, ARG3 +FIELD *, 20, %s, choose, value=resid, detResidExp.php, ARG4 +FIELD detRunSummary.bg, 20, %s, bg +FIELD detRunSummary.bg_stdev, 20, %s, bg_stdev # FIELD bg_mean_stdev, 20, bg_mean_stdev Index: trunk/ippMonitor/def/masterDetrendFrames.d =================================================================== --- trunk/ippMonitor/def/masterDetrendFrames.d (revision 15784) +++ trunk/ippMonitor/def/masterDetrendFrames.d (revision 15954) @@ -22,14 +22,14 @@ ARGS ARG4 detResidExp.iteration=$detRunSummary.iteration -# field width name show link to extras -FIELD detRunSummary.det_id, 5, det ID, value, detRunSummary.php, ARG1 -FIELD detRunSummary.iteration, 3, iter -FIELD detRun.det_type, 5, type -FIELD detRun.state, 5, state -FIELD *, 20, choose, value=input, detInputExp.php, ARG2 -FIELD *, 20, choose, value=proc, detProcessedExp.php, ARG3 -FIELD *, 20, choose, value=resid, detResidExp.php, ARG4 -FIELD detRunSummary.bg, 20, bg -FIELD detRunSummary.bg_stdev, 20, bg_stdev +# field width format name show link to extras +FIELD detRunSummary.det_id, 5, %s, det ID, value, detRunSummary.php, ARG1 +FIELD detRunSummary.iteration, 3, %s, iter +FIELD detRun.det_type, 5, %s, type +FIELD detRun.state, 5, %s, state +FIELD *, 20, %s, choose, value=input, detInputExp.php, ARG2 +FIELD *, 20, %s, choose, value=proc, detProcessedExp.php, ARG3 +FIELD *, 20, %s, choose, value=resid, detResidExp.php, ARG4 +FIELD detRunSummary.bg, 20, %s, bg +FIELD detRunSummary.bg_stdev, 20, %s, bg_stdev # FIELD bg_mean_stdev, 20, bg_mean_stdev Index: trunk/ippMonitor/def/newExp.d =================================================================== --- trunk/ippMonitor/def/newExp.d (revision 15784) +++ trunk/ippMonitor/def/newExp.d (revision 15954) @@ -6,8 +6,8 @@ WHERE state != 'stop' -# field name show link to extras -FIELD exp_id, 5, exposure ID -FIELD tmp_exp_name, 10, exposure Name -FIELD tmp_camera, 5, camera -FIELD tmp_telescope, 5, telescope -FIELD state, 5, state +# field size format name show link to extras +FIELD exp_id, 5, %s, exposure ID +FIELD tmp_exp_name, 10, %s, exposure Name +FIELD tmp_camera, 5, %s, camera +FIELD tmp_telescope, 5, %s, telescope +FIELD state, 5, %s, state Index: trunk/ippMonitor/def/newImfile.d =================================================================== --- trunk/ippMonitor/def/newImfile.d (revision 15784) +++ trunk/ippMonitor/def/newImfile.d (revision 15954) @@ -4,6 +4,6 @@ MENU ipp.imfiles.dat -# field name show link to extras -FIELD exp_id, 5, exposure ID -FIELD tmp_class_id, 5, class ID -FIELD uri, 5, URI +# field size format name show link to extras +FIELD exp_id, 5, %s, exposure ID +FIELD tmp_class_id, 5, %s, class ID +FIELD uri, 5, %s, URI Index: trunk/ippMonitor/def/pzPendingExp.d =================================================================== --- trunk/ippMonitor/def/pzPendingExp.d (revision 15784) +++ trunk/ippMonitor/def/pzPendingExp.d (revision 15954) @@ -4,6 +4,6 @@ MENU ipp.copy.dat -# field size name show link to extras -FIELD exp_name, 5, exposures ID -FIELD camera, 5, camera -FIELD telescope, 5, telescope +# field size format name show link to extras +FIELD exp_name, 5, %s, exposures ID +FIELD camera, 5, %s, camera +FIELD telescope, 5, %s, telescope Index: trunk/ippMonitor/def/pzPendingImfile.d =================================================================== --- trunk/ippMonitor/def/pzPendingImfile.d (revision 15784) +++ trunk/ippMonitor/def/pzPendingImfile.d (revision 15954) @@ -4,9 +4,9 @@ MENU ipp.imfiles.dat -# field name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 5, Exp Name -FIELD camera, 5, camera -FIELD telescope, 5, telescope -FIELD class, 5, class -FIELD class_id, 5, class ID +# field size format name show link to extras +FIELD exp_id, 5, %s, Exp ID +FIELD exp_name, 5, %s, Exp Name +FIELD camera, 5, %s, camera +FIELD telescope, 5, %s, telescope +FIELD class, 5, %s, class +FIELD class_id, 5, %s, class ID Index: trunk/ippMonitor/def/rawDetrendExp.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp.d (revision 15784) +++ trunk/ippMonitor/def/rawDetrendExp.d (revision 15954) @@ -9,26 +9,26 @@ ARGS ARG1 exp_id=$exp_id -# field size name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 10, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, Telescope -FIELD camera, 10, Camera -FIELD exp_type, 10, Type -FIELD filter, 10, FILTER -FIELD dateobs, 20, Date/Time -FIELD exp_time, 5, exp_time -FIELD sat_pixel_frac, 5, f(sat pixels) -FIELD airmass, 5, airmass -FIELD bg, 5, backgnd -FIELD bg_stdev, 5, stdev -FIELD bg_mean_stdev, 5, <backgnd> -# FIELD ra, 8, ra -# FIELD decl, 8, decl -# FIELD object, 10, object -# FIELD imfiles, 20, imfiles -# FIELD airmass, 20, airmass -# 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 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 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 ra, 8, %s, ra +# FIELD decl, 8, %s, decl +# FIELD object, 10, %s, object +# FIELD imfiles, 20, %s, imfiles +# FIELD airmass, 20, %s, airmass +# FIELD bg_mean_stdev, 20, %s, bg_mean_stdev +# FIELD alt, 20, %s, alt +# FIELD az, 20, %s, az +# FIELD ccd_temp, 20, %s, ccd_temp +# FIELD posang, 20, %s, posang Index: trunk/ippMonitor/def/rawDetrendExp_detrend.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 15784) +++ trunk/ippMonitor/def/rawDetrendExp_detrend.d (revision 15954) @@ -9,25 +9,25 @@ ARGS ARG1 exp_id=$exp_id -# field size name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 10, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, Telescope -FIELD camera, 10, Camera -FIELD exp_type, 10, Type -FIELD filter, 10, FILTER -FIELD dateobs, 20, Date/Time -FIELD exp_time, 5, exp_time -FIELD sat_pixel_frac, 5, f(sat pixels) -FIELD airmass, 5, airmass -FIELD bg, 5, backgnd -FIELD bg_stdev, 5, stdev -FIELD bg_mean_stdev, 5, <backgnd> -# FIELD imfiles, 20, imfiles -# FIELD airmass, 20, airmass -# FIELD ra, 20, ra -# FIELD decl, 20, decl -# FIELD exp_time, 20, exp_time -# FIELD bg, 20, bg -# FIELD bg_stdev, 20, bg_stdev +# 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 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 imfiles, 20, %s, imfiles +# FIELD airmass, 20, %s, airmass +# FIELD ra, 20, %s, ra +# FIELD decl, 20, %s, decl +# FIELD exp_time, 20, %s, exp_time +# FIELD bg, 20, %s, bg +# FIELD bg_stdev, 20, %s, bg_stdev # FIELD bg_mean_stdev, 20, bg_mean_stdev # FIELD alt, 20, alt Index: trunk/ippMonitor/def/rawExp.d =================================================================== --- trunk/ippMonitor/def/rawExp.d (revision 15784) +++ trunk/ippMonitor/def/rawExp.d (revision 15954) @@ -6,18 +6,18 @@ ARGS ARG1 exp_id=$exp_id -# field size name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 10, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, Telescope -FIELD camera, 10, Camera -FIELD exp_type, 8, Type -FIELD filter, 10, FILTER -FIELD ra, 8, ra -FIELD decl, 8, decl -FIELD object, 10, object -FIELD airmass, 5, airmass -FIELD exp_time, 5, exp_time -FIELD bg, 5, bg -FIELD bg_stdev, 5, bg_stdev +# 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, 8, %s, Type +FIELD filter, 10, %s, FILTER +FIELD ra, 8, %s, ra +FIELD decl, 8, %s, decl +FIELD object, 10, %s, object +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 Index: trunk/ippMonitor/def/rawExp_failed.d =================================================================== --- trunk/ippMonitor/def/rawExp_failed.d (revision 15784) +++ trunk/ippMonitor/def/rawExp_failed.d (revision 15954) @@ -9,25 +9,25 @@ ARGS ARG1 exp_id=$exp_id -# field size name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 10, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, Telescope -FIELD camera, 10, Camera -FIELD exp_type, 10, Type -FIELD filter, 10, FILTER -FIELD dateobs, 20, Date/Time -FIELD exp_time, 5, exp_time -FIELD airmass, 5, airmass -FIELD bg, 5, backgnd -FIELD bg_stdev, 5, stdev -FIELD bg_mean_stdev, 5, <backgnd> -# FIELD ra, 8, ra -# FIELD decl, 8, decl -# FIELD object, 10, object -# FIELD imfiles, 20, imfiles -# FIELD airmass, 20, airmass -# 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 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 filter, 10, %s, FILTER +FIELD dateobs, 20, %s, Date/Time +FIELD exp_time, 5, %s, exp_time +FIELD airmass, 5, %s, airmass +FIELD bg, 5, %s, backgnd +FIELD bg_stdev, 5, %s, stdev +FIELD bg_mean_stdev, 5, %s, <backgnd> +# FIELD ra, 8, %s, ra +# FIELD decl, 8, %s, decl +# FIELD object, 10, %s, object +# FIELD imfiles, 20, %s, imfiles +# FIELD airmass, 20, %s, airmass +# FIELD bg_mean_stdev, 20, %s, bg_mean_stdev +# FIELD alt, 20, %s, alt +# FIELD az, 20, %s, az +# FIELD ccd_temp, 20, %s, ccd_temp +# FIELD posang, 20, %s, posang Index: trunk/ippMonitor/def/rawImfile.d =================================================================== --- trunk/ippMonitor/def/rawImfile.d (revision 15784) +++ trunk/ippMonitor/def/rawImfile.d (revision 15954) @@ -6,13 +6,13 @@ HEAD PHP insert_backref ("rawExp.php", "exp_id", $ID['link']); -# field name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 5, Exposure -FIELD class_id, 8, Chip ID -FIELD bg, 8, backgnd -FIELD bg_stdev, 8, stdev -FIELD bg_mean_stdev, 8, [stdev] -FIELD uri, 10, uri -# FIELD class, 20, Class +# field size format name show link to extras +FIELD exp_id, 5, %s, Exp ID +FIELD exp_name, 5, %s, Exposure +FIELD class_id, 8, %s, Chip ID +FIELD bg, 8, %s, backgnd +FIELD bg_stdev, 8, %s, stdev +FIELD bg_mean_stdev, 8, %s, [stdev] +FIELD uri, 10, %s, uri +# FIELD class, 20, %s, Class # FIELD uri, 20, uri # FIELD exp_type, 20, exp_type Index: trunk/ippMonitor/def/rawImfile_failed.d =================================================================== --- trunk/ippMonitor/def/rawImfile_failed.d (revision 15784) +++ trunk/ippMonitor/def/rawImfile_failed.d (revision 15954) @@ -7,13 +7,13 @@ WHERE fault > 0 -# field name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 5, Exposure -FIELD class_id, 8, Chip ID -FIELD bg, 8, backgnd -FIELD bg_stdev, 8, stdev -FIELD bg_mean_stdev, 8, [stdev] -FIELD uri, 10, uri -# FIELD class, 20, Class +# field size format name show link to extras +FIELD exp_id, 5, %s, Exp ID +FIELD exp_name, 5, %s, Exposure +FIELD class_id, 8, %s, Chip ID +FIELD bg, 8, %s, backgnd +FIELD bg_stdev, 8, %s, stdev +FIELD bg_mean_stdev, 8, %s, [stdev] +FIELD uri, 10, %s, uri +# FIELD class, 20, %s, Class # FIELD uri, 20, uri # FIELD exp_type, 20, exp_type Index: trunk/ippMonitor/def/rawScienceExp.d =================================================================== --- trunk/ippMonitor/def/rawScienceExp.d (revision 15784) +++ trunk/ippMonitor/def/rawScienceExp.d (revision 15954) @@ -9,18 +9,21 @@ ARGS ARG1 exp_id=$exp_id -# field size name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 10, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, Telescope -FIELD camera, 10, Camera -FIELD exp_type, 8, Type -FIELD filter, 10, FILTER -FIELD ra, 8, ra -FIELD decl, 8, decl -FIELD object, 10, object -FIELD airmass, 5, airmass -FIELD exp_time, 5, exp_time -FIELD bg, 5, bg -FIELD bg_stdev, 5, bg_stdev +OP OP1 $ra * 57.295783 +OP OP2 $decl * 57.295783 + +# 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, 8, %s, Type +FIELD filter, 10, %s, FILTER +FIELD ra, 8, %10.6f, RA, op=OP1 +FIELD decl, 8, %10.6f, DEC, op=OP2 +FIELD object, 10, %s, object +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 Index: trunk/ippMonitor/def/rawUnknownExp.d =================================================================== --- trunk/ippMonitor/def/rawUnknownExp.d (revision 15784) +++ trunk/ippMonitor/def/rawUnknownExp.d (revision 15954) @@ -9,25 +9,25 @@ ARGS ARG1 exp_id=$exp_id -# field size name show link to extras -FIELD exp_id, 5, Exp ID -FIELD exp_name, 10, Exp Name, value, rawImfile.php, ARG1 -FIELD telescope, 10, Telescope -FIELD camera, 10, Camera -FIELD exp_type, 10, Type -FIELD filter, 10, FILTER -FIELD dateobs, 20, Date/Time -FIELD exp_time, 5, exp_time -FIELD airmass, 5, airmass -FIELD bg, 5, backgnd -FIELD bg_stdev, 5, stdev -FIELD bg_mean_stdev, 5, <backgnd> -# FIELD ra, 8, ra -# FIELD decl, 8, decl -# FIELD object, 10, object -# FIELD imfiles, 20, imfiles -# FIELD airmass, 20, airmass -# 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 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 filter, 10, %s, FILTER +FIELD dateobs, 20, %s, Date/Time +FIELD exp_time, 5, %s, exp_time +FIELD airmass, 5, %s, airmass +FIELD bg, 5, %s, backgnd +FIELD bg_stdev, 5, %s, stdev +FIELD bg_mean_stdev, 5, %s, <backgnd> +# FIELD ra, 8, %s, ra +# FIELD decl, 8, %s, decl +# FIELD object, 10, %s, object +# FIELD imfiles, 20, %s, imfiles +# FIELD airmass, 20, %s, airmass +# FIELD bg_mean_stdev, 20, %s, bg_mean_stdev +# FIELD alt, 20, %s, alt +# FIELD az, 20, %s, az +# FIELD ccd_temp, 20, %s, ccd_temp +# FIELD posang, 20, %s, posang Index: trunk/ippMonitor/def/stackInputSkyfile.d =================================================================== --- trunk/ippMonitor/def/stackInputSkyfile.d (revision 15784) +++ trunk/ippMonitor/def/stackInputSkyfile.d (revision 15954) @@ -4,5 +4,5 @@ MENU ipp.stack.dat -# field name show link to extras -FIELD stack_id, 20, stack ID -FIELD warp_id, 20, warp ID +# field format name show link to extras +FIELD stack_id, %s, 20, stack ID +FIELD warp_id, %s, 20, warp ID Index: trunk/ippMonitor/def/stackRun.d =================================================================== --- trunk/ippMonitor/def/stackRun.d (revision 15784) +++ trunk/ippMonitor/def/stackRun.d (revision 15954) @@ -4,10 +4,10 @@ MENU ipp.stack.dat -# field name show link to extras -FIELD stack_id, 20, stack ID -FIELD skycell_id, 20, skycell ID -FIELD tess_id, 20, tessellation ID -FIELD state, 20, state -FIELD workdir, 20, workdir -FIELD dvodb, 20, DVO database -FIELD registered, 20, time registered +# field format name show link to extras +FIELD stack_id, %s, 20, stack ID +FIELD skycell_id, %s, 20, skycell ID +FIELD tess_id, %s, 20, tessellation ID +FIELD state, %s, 20, state +FIELD workdir, %s, 20, workdir +FIELD dvodb, %s, 20, DVO database +FIELD registered, %s, 20, time registered Index: trunk/ippMonitor/def/stackSumSkyfile.d =================================================================== --- trunk/ippMonitor/def/stackSumSkyfile.d (revision 15784) +++ trunk/ippMonitor/def/stackSumSkyfile.d (revision 15954) @@ -4,7 +4,7 @@ MENU ipp.stack.dat -# field name show link to extras -FIELD stack_id, 20, stack ID -FIELD URI, 20, URI -FIELD bg, 20, background -FIELD bg_stdev, 20, standard deviation +# field format name show link to extras +FIELD stack_id, %s, 20, stack ID +FIELD URI, %s, 20, URI +FIELD bg, %s, 20, background +FIELD bg_stdev, %s, 20, standard deviation Index: trunk/ippMonitor/def/summitExp.d =================================================================== --- trunk/ippMonitor/def/summitExp.d (revision 15784) +++ trunk/ippMonitor/def/summitExp.d (revision 15954) @@ -4,9 +4,9 @@ MENU ipp.copy.dat -# field size, name show link to extras -FIELD exp_name, 5, exposure ID -FIELD camera, 5, camera -FIELD telescope, 5, telescope -FIELD dateobs, 5, date/time -FIELD exp_type, 5, type -FIELD uri, 5, URI +# field size, format name show link to extras +FIELD exp_name, 5, %s, exposure ID +FIELD camera, 5, %s, camera +FIELD telescope, 5, %s, telescope +FIELD dateobs, 5, %s, 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 15784) +++ trunk/ippMonitor/def/warpInputExp.d (revision 15954) @@ -7,9 +7,9 @@ WHERE camProcessedExp.chip_id = chipProcessedExp.chip_id -# field size name show link to extras -FIELD warpInputExp.warp_id, 5, warp ID -FIELD chipProcessedExp.exp_id, 5, Exp ID -FIELD chipProcessedExp.exp_name, 5, Exp Name -FIELD chipProcessedExp.chip_id, 5, chip ID -FIELD camProcessedExp.cam_id, 5, cam ID -FIELD magiced, 5, magic? +# field size format name show link to extras +FIELD warpInputExp.warp_id, 5, %s, warp ID +FIELD chipProcessedExp.exp_id, 5, %s, Exp ID +FIELD chipProcessedExp.exp_name, 5, %s, Exp Name +FIELD chipProcessedExp.chip_id, 5, %s, chip ID +FIELD camProcessedExp.cam_id, 5, %s, cam ID +FIELD magiced, 5, %s, magic? Index: trunk/ippMonitor/def/warpRun.d =================================================================== --- trunk/ippMonitor/def/warpRun.d (revision 15784) +++ trunk/ippMonitor/def/warpRun.d (revision 15954) @@ -4,9 +4,9 @@ MENU ipp.warp.dat -# field name show link to extras -FIELD warp_id, 20, warp ID -FIELD mode, 20, mode -FIELD state, 20, state -FIELD workdir, 20, workdir -FIELD dvodb, 20, DVO database -FIELD registered, 20, time registered +# field format name show link to extras +FIELD warp_id, %s, 20, warp ID +FIELD mode, %s, 20, mode +FIELD state, %s, 20, state +FIELD workdir, %s, 20, workdir +FIELD dvodb, %s, 20, DVO database +FIELD registered, %s, 20, time registered Index: trunk/ippMonitor/def/warpSkycellMap.d =================================================================== --- trunk/ippMonitor/def/warpSkycellMap.d (revision 15784) +++ trunk/ippMonitor/def/warpSkycellMap.d (revision 15954) @@ -1,15 +1,16 @@ -TABLE warpSkyCellMap, camProcessedExp, chipProcessedExp +TABLE warpSkyCellMap, camProcessedExp, chipProcessedExp, rawExp TITLE warpSkyCellMap FILE warpSkyCellMap.php MENU ipp.warp.dat -WHERE warpSkyCellMap.cam_id = camProcessedExp.cam_id +WHERE warpSkyCellMap.cam_id = camProcessedExp.cam_id WHERE camProcessedExp.chip_id = chipProcessedExp.chip_id +WHERE chipProcessedExp.exp_id = rawExp.exp_id -# field size name show link to extras -FIELD warpSkyCellMap.warp_id, 5, Warp ID -FIELD warpSkyCellMap.skycell_id, 5, Skycell ID -FIELD warpSkyCellMap.tess_id, 5, Tessellation ID -FIELD chipProcessedExp.exp_id, 5, Exp ID -FIELD chipProcessedExp.exp_name, 5, Exp Name -FIELD warpSkyCellMap.class_id, 5, Class ID +# field size format name show link to extras +FIELD warpSkyCellMap.warp_id, 5, %s, Warp ID +FIELD warpSkyCellMap.skycell_id, 5, %s, Skycell ID +FIELD warpSkyCellMap.tess_id, 5, %s, Tessellation ID +FIELD chipProcessedExp.exp_id, 5, %s, Exp ID +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD warpSkyCellMap.class_id, 5, %s, Class ID Index: trunk/ippMonitor/def/warpSkyfile.d =================================================================== --- trunk/ippMonitor/def/warpSkyfile.d (revision 15784) +++ trunk/ippMonitor/def/warpSkyfile.d (revision 15954) @@ -4,9 +4,9 @@ MENU ipp.warp.dat -# field name show link to extras -FIELD warp_id, 20, warp ID -FIELD skycell_id, 20, skycell ID -FIELD tess_id, 20, tessellation ID -FIELD uri, 20, URI -FIELD bg, 20, background -FIELD bg_stdev, 20, standard deviation +# field size format name show link to extras +FIELD warp_id, 20, %s, warp ID +FIELD skycell_id, 20, %s, skycell ID +FIELD tess_id, 20, %s, tessellation ID +FIELD uri, 20, %s, URI +FIELD bg, 20, %s, background +FIELD bg_stdev, 20, %s, standard deviation Index: trunk/ippMonitor/raw/ipp.php =================================================================== --- trunk/ippMonitor/raw/ipp.php (revision 15784) +++ trunk/ippMonitor/raw/ipp.php (revision 15954) @@ -434,6 +434,6 @@ } -function write_table_cell ($class, $link, $value) { - $myValue = $value; +function write_table_cell ($class, $format, $link, $value) { + $myValue = sprintf ($format, $value); if ($myValue == "") { $myValue = " "; } Index: trunk/ippMonitor/scripts/generate =================================================================== --- trunk/ippMonitor/scripts/generate (revision 15784) +++ trunk/ippMonitor/scripts/generate (revision 15954) @@ -45,12 +45,14 @@ # list of the table fields if ($key eq "FIELD") { - ($field, $width, $name, $show, $link, $extras) = split (/,\s+/, $value, 6); + ($field, $width, $format, $name, $show, $link, $extras) = split (/,\s+/, $value, 7); if (! $name) { die "table $ARGV[0] missing required elements\n"; } # ($field) = $field =~ m|\s*(\S+)\s*|; - if ($VERBOSE) { printf "%-20s %-20s %-20s %-20s %-20s\n", $field, $name, $show, $link, $extras; } + if ($VERBOSE) { printf "%-20s %-20s %-20s %-20s %-20s %-20s\n", $field, $name, $format, $show, $link, $extras; } + if ($show eq "") {$show = "value";} push @field, $field; push @width, $width; + push @format, $format; push @name, $name; push @show, $show; @@ -244,5 +246,4 @@ if (@tdClasses == 0) { return; } foreach $tdClass (@tdClasses) { - print STDERR "write TD CLASS: $tdClass...\n"; # TD_CLASS class field expression @@ -254,8 +255,4 @@ printf FILE " \$class = \"$class\";\n"; printf FILE " }\n"; - - printf STDERR " if ($field $testline) {\n"; - printf STDERR " \$class = \"$class\";\n"; - printf STDERR " }\n"; } } @@ -308,5 +305,5 @@ # print the actual table cell line with the link... if (! $value && ($field[$i] ne "*")) { $value = "\$row[$Nrow]"; } - printf FILE " write_table_cell (\$class, $myLink, $value);\n"; + print FILE " write_table_cell (\$class, '$format[$i]', $myLink, $value);\n"; next; } @@ -322,5 +319,5 @@ $myLink = "\"\""; } - printf FILE " write_table_cell (\$class, $myLink, $ops{$value});\n"; + print FILE " write_table_cell (\$class, '$format[$i]', $myLink, $ops{$value});\n"; next; } @@ -526,4 +523,6 @@ $opline = ""; + @outwords = (); + @outfields = (); foreach $word (@words) { $fword = &parse_fieldname ($word); @@ -538,4 +537,7 @@ $outline = join (" ", @outfields); $opf{$name} = $outline; + + # print "ops: $name : $ops{$name}\n"; + # print "opf: $name : $opf{$name}\n"; return 1;