Index: trunk/ippMonitor/def/detInputExp.d =================================================================== --- trunk/ippMonitor/def/detInputExp.d (revision 9008) +++ trunk/ippMonitor/def/detInputExp.d (revision 9009) @@ -9,9 +9,9 @@ # field name show link to extras -FIELD det_id, det_id -FIELD iteration, iteration -FIELD exp_id, exp_id, value, rawImfile.php, exp_id=$exp_id -FIELD exp_id, processed, value=proc, detProcessedImfile.php, exp_id=$exp_id,det_id=$det_id -FIELD include, include +FIELD det_id, 20, det_id +FIELD iteration, 20, iteration +FIELD exp_id, 20, exp_id, value, rawImfile.php, exp_id=$exp_id +FIELD exp_id, 20, processed, value=proc, detProcessedImfile.php, exp_id=$exp_id,det_id=$det_id +FIELD include, 20, include TAIL HTML test tail 1
Index: trunk/ippMonitor/def/detMasterFrame.d =================================================================== --- trunk/ippMonitor/def/detMasterFrame.d (revision 9008) +++ trunk/ippMonitor/def/detMasterFrame.d (revision 9009) @@ -5,5 +5,5 @@ # field name show link to extras -FIELD det_id, det_id -FIELD iteration, iteration -FIELD comment, comment +FIELD det_id, 20, det_id +FIELD iteration, 20, iteration +FIELD comment, 20, comment Index: trunk/ippMonitor/def/detMasterImfile.d =================================================================== --- trunk/ippMonitor/def/detMasterImfile.d (revision 9008) +++ trunk/ippMonitor/def/detMasterImfile.d (revision 9009) @@ -5,6 +5,6 @@ # field name show link to extras -FIELD det_id, det_id -FIELD class_id, class_id -FIELD uri, uri -FIELD recipe, recipe +FIELD det_id, 20, det_id +FIELD class_id, 20, class_id +FIELD uri, 20, uri +FIELD recipe, 20, recipe Index: trunk/ippMonitor/def/detNormalizedImfile.d =================================================================== --- trunk/ippMonitor/def/detNormalizedImfile.d (revision 9008) +++ trunk/ippMonitor/def/detNormalizedImfile.d (revision 9009) @@ -5,6 +5,6 @@ # field name show link to extras -FIELD det_id, det_id -FIELD iteration, iteration -FIELD class_id, class_id -FIELD uri, uri +FIELD det_id, 20, det_id +FIELD iteration, 20, iteration +FIELD class_id, 20, class_id +FIELD uri, 20, uri Index: trunk/ippMonitor/def/detNormalizedStatImfile.d =================================================================== --- trunk/ippMonitor/def/detNormalizedStatImfile.d (revision 9008) +++ trunk/ippMonitor/def/detNormalizedStatImfile.d (revision 9009) @@ -5,6 +5,6 @@ # field name show link to extras -FIELD det_id, det_id -FIELD iteration, iteration -FIELD class_id, class_id -FIELD norm, norm +FIELD det_id, 20, det_id +FIELD iteration, 20, iteration +FIELD class_id, 20, class_id +FIELD norm, 20, norm Index: trunk/ippMonitor/def/detProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/detProcessedImfile.d (revision 9008) +++ trunk/ippMonitor/def/detProcessedImfile.d (revision 9009) @@ -8,10 +8,10 @@ # field name show link to extras -FIELD det_id, det_id -FIELD exp_id, exp_id -FIELD class_id, class_id -FIELD uri, uri -FIELD recipe, recipe -FIELD bg, bg -FIELD bg_stdev, bg_stdev -FIELD bg_mean_stdev, bg_mean_stdev +FIELD det_id, 20, det_id +FIELD exp_id, 20, exp_id +FIELD class_id, 20, class_id +FIELD uri, 20, uri +FIELD recipe, 20, recipe +FIELD bg, 20, bg +FIELD bg_stdev, 20, bg_stdev +FIELD bg_mean_stdev, 20, bg_mean_stdev Index: trunk/ippMonitor/def/detResidExp.d =================================================================== --- trunk/ippMonitor/def/detResidExp.d (revision 9008) +++ trunk/ippMonitor/def/detResidExp.d (revision 9009) @@ -5,12 +5,12 @@ # field name show link to extras -FIELD det_id, det_id, value -FIELD iteration, iteration, value -FIELD accept, accept, value -FIELD exp_id, exp_id, value, rawImfile.php, exp_id=$exp_id -FIELD b2_uri, b2_uri, image=$b2_uri, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_id=$exp_id,image=$b1_uri -FIELD recipe, recipe, value -FIELD bg, backgnd, value -FIELD bg_stdev, bg_stdev, value -FIELD b1_uri, b1_uri, none -# FIELD bg_mean_stdev, bg_mean_stdev +FIELD det_id, 20, det_id, value +FIELD iteration, 20, iteration, value +FIELD accept, 20, accept, value +FIELD exp_id, 20, exp_id, value, rawImfile.php, exp_id=$exp_id +FIELD b2_uri, 20, b2_uri, image=$b2_uri, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_id=$exp_id,image=$b1_uri +FIELD recipe, 20, recipe, value +FIELD bg, 20, backgnd, value +FIELD bg_stdev, 20, bg_stdev, value +FIELD b1_uri, 20, b1_uri, none +# FIELD bg_mean_stdev, 20, bg_mean_stdev Index: trunk/ippMonitor/def/detResidImfile.d =================================================================== --- trunk/ippMonitor/def/detResidImfile.d (revision 9008) +++ trunk/ippMonitor/def/detResidImfile.d (revision 9009) @@ -4,16 +4,16 @@ MENU ipp.imfiles.dat -# field name show link to extras -FIELD det_id, det_id -FIELD iteration, iteration -FIELD exp_id, exp_id -FIELD class_id, class_id -FIELD uri, uri -FIELD recipe, recipe -FIELD bg, bg -FIELD bg_stdev, bg_stdev -FIELD bg_mean_stdev, bg_mean_stdev -FIELD b1_uri, b1_uri -FIELD b2_uri, b2_uri +# field width name show link to extras +FIELD det_id, 20, det_id +FIELD iteration, 20, iteration +FIELD exp_id, 20, exp_id +FIELD class_id, 20, class_id +FIELD uri, 20, uri +FIELD recipe, 20, recipe +FIELD bg, 20, bg +FIELD bg_stdev, 20, bg_stdev +FIELD bg_mean_stdev, 20, bg_mean_stdev +# FIELD b1_uri, 20, b1_uri +# FIELD b2_uri, 20, b2_uri TAIL PHP insert_image ('image'); Index: trunk/ippMonitor/def/detRun.d =================================================================== --- trunk/ippMonitor/def/detRun.d (revision 9008) +++ trunk/ippMonitor/def/detRun.d (revision 9009) @@ -5,5 +5,5 @@ # field name show link to extras -FIELD position, det ID, value, detRunSummary.php, det_id=$position -FIELD iteration, iteration -FIELD det_type, det_type +FIELD position, 20, det ID, value, detRunSummary.php, det_id=$position +FIELD iteration, 20, iteration +FIELD det_type, 20, det_type Index: trunk/ippMonitor/def/detRunSummary.d =================================================================== --- trunk/ippMonitor/def/detRunSummary.d (revision 9008) +++ trunk/ippMonitor/def/detRunSummary.d (revision 9009) @@ -4,10 +4,11 @@ MENU ipp.detrend.dat -# field name show link to extras -FIELD det_id, det_id -FIELD iteration, iteration, value, detInputExp.php, det_id=$det_id,iteration=$iteration -FIELD iteration, iteration, value=resid, detResidExp.php, det_id=$det_id,iteration=$iteration -FIELD accept, accept -FIELD bg, bg -FIELD bg_stdev, bg_stdev -# FIELD bg_mean_stdev, bg_mean_stdev +# field name show link to extras +FIELD det_id, 7, det_id +FIELD iteration, 5, iter +FIELD accept, 20, accept +FIELD *, 20, choose, value=input, detInputExp.php, det_id=$det_id,iteration=$iteration +FIELD *, 20, choose, value=resid, detResidExp.php, det_id=$det_id,iteration=$iteration +FIELD bg, 20, bg +FIELD bg_stdev, 20, bg_stdev +# FIELD bg_mean_stdev, 20, bg_mean_stdev Index: trunk/ippMonitor/def/detStackedImfile.d =================================================================== --- trunk/ippMonitor/def/detStackedImfile.d (revision 9008) +++ trunk/ippMonitor/def/detStackedImfile.d (revision 9009) @@ -5,11 +5,11 @@ # field name show link to extras -FIELD det_id, det_id -FIELD iteration, iteration -FIELD class_id, class_id -FIELD uri, uri -FIELD recipe, recipe -FIELD bg, bg -FIELD bg_stdev, bg_stdev -FIELD bg_mean_stdev, bg_mean_stdev -FIELD normalize, normalize +FIELD det_id, 20, det_id +FIELD iteration, 20, iteration +FIELD class_id, 20, class_id +FIELD uri, 20, uri +FIELD recipe, 20, recipe +FIELD bg, 20, bg +FIELD bg_stdev, 20, bg_stdev +FIELD bg_mean_stdev, 20, bg_mean_stdev +FIELD normalize, 20, normalize Index: trunk/ippMonitor/def/masterDetrendImages.d =================================================================== --- trunk/ippMonitor/def/masterDetrendImages.d (revision 9008) +++ trunk/ippMonitor/def/masterDetrendImages.d (revision 9009) @@ -7,7 +7,4 @@ MENU ipp.detrend.dat -HEAD PHP insert_image ('image'); -HEAD HTML extra lines

- # the following WHERE clauses are added to all queries joined by AND WHERE detRunSummary.accept = 1 @@ -15,12 +12,13 @@ WHERE detRun.iteration = detRunSummary.iteration -# field name show link to extras -FIELD detRunSummary.det_id, det_id -FIELD detRun.det_type, type -FIELD detRunSummary.iteration, iteration, value, detInputExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration -FIELD *, resid, value=resid, detResidExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration -FIELD detRunSummary.bg, bg -FIELD detRunSummary.bg_stdev, bg_stdev -# FIELD bg_mean_stdev, bg_mean_stdev +# field width name show link to extras +FIELD detRunSummary.det_id, 7, det_id, value, detRunSummary.php, det_id=$detRunSummary.det_id +FIELD detRun.det_type, 5, type +FIELD detRunSummary.iteration, 5, iter +FIELD *, 20, choose, value=input, detInputExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration +FIELD *, 20, choose, value=resid, detResidExp.php, det_id=$detRunSummary.det_id,iteration=$detRunSummary.iteration +FIELD detRunSummary.bg, 20, bg +FIELD detRunSummary.bg_stdev, 20, bg_stdev +# FIELD bg_mean_stdev, 20, bg_mean_stdev # this file illustrates a simple inner join to generate the output table @@ -30,5 +28,2 @@ # WHERE detRunSummary.accept = 1 AND detRun.position = detRunSummary.det_id AND detRun.iteration = detRunSummary.iteration \ # LIMIT 20 - -TAIL HTML extra tail lines
-TAIL PHP echo "this is a php line at the end
\n"; Index: trunk/ippMonitor/def/newExp.d =================================================================== --- trunk/ippMonitor/def/newExp.d (revision 9008) +++ trunk/ippMonitor/def/newExp.d (revision 9009) @@ -5,7 +5,7 @@ # field name show link to extras -FIELD exp_id, exposure ID -FIELD camera, camera -FIELD telescope, telescope -FIELD exp_type, type -FIELD imfiles, N imfiles +FIELD exp_id, 20, exposure ID +FIELD camera, 20, camera +FIELD telescope, 20, telescope +FIELD exp_type, 20, type +FIELD imfiles, 20, N imfiles Index: trunk/ippMonitor/def/newImfile.d =================================================================== --- trunk/ippMonitor/def/newImfile.d (revision 9008) +++ trunk/ippMonitor/def/newImfile.d (revision 9009) @@ -5,6 +5,6 @@ # field name show link to extras -FIELD exp_id, exposure ID -FIELD class, class -FIELD class_id, class ID -FIELD uri, URI +FIELD exp_id, 20, exposure ID +FIELD class, 20, class +FIELD class_id, 20, class ID +FIELD uri, 20, URI Index: trunk/ippMonitor/def/p1PendingExp.d =================================================================== --- trunk/ippMonitor/def/p1PendingExp.d (revision 9008) +++ trunk/ippMonitor/def/p1PendingExp.d (revision 9009) @@ -5,5 +5,5 @@ # field name show link to extras -FIELD exp_id, exposure ID, value, rawImfile.php, exp_id=$exp_id -FIELD recipe, recipe -FIELD p1_version, p1 version +FIELD exp_id, 20, exposure ID, value, rawImfile.php, exp_id=$exp_id +FIELD recipe, 20, recipe +FIELD p1_version, 20, p1 version Index: trunk/ippMonitor/def/p2PendingExp.d =================================================================== --- trunk/ippMonitor/def/p2PendingExp.d (revision 9008) +++ trunk/ippMonitor/def/p2PendingExp.d (revision 9009) @@ -5,6 +5,6 @@ # field name show link to extras -FIELD exp_id, exposure ID, value, rawImfile.php, exp_id=$exp_id -FIELD recipe, recipe -FIELD p1_version, p1 version -FIELD p2_version, p2 version +FIELD exp_id, 20, exposure ID, value, rawImfile.php, exp_id=$exp_id +FIELD recipe, 20, recipe +FIELD p1_version, 20, p1 version +FIELD p2_version, 20, p2 version Index: trunk/ippMonitor/def/p2PendingImfile.d =================================================================== --- trunk/ippMonitor/def/p2PendingImfile.d (revision 9008) +++ trunk/ippMonitor/def/p2PendingImfile.d (revision 9009) @@ -5,8 +5,8 @@ # field name show link to extras -FIELD exp_id, exposure ID -FIELD class_id, class ID -FIELD uri, URI -FIELD recipe, recipe -FIELD p1_version, p1 version -FIELD p2_version, p2 version +FIELD exp_id, 20, exposure ID +FIELD class_id, 20, class ID +FIELD uri, 20, URI +FIELD recipe, 20, recipe +FIELD p1_version, 20, p1 version +FIELD p2_version, 20, p2 version Index: trunk/ippMonitor/def/p2ProcessedExp.d =================================================================== --- trunk/ippMonitor/def/p2ProcessedExp.d (revision 9008) +++ trunk/ippMonitor/def/p2ProcessedExp.d (revision 9009) @@ -5,5 +5,5 @@ # field name show link to extras -FIELD exp_id, exposure ID, value, p2ProcessedImfile.php, exp_id=$exp_id -FIELD p1_version, p1 version, value, p1PendingExp.php exp_id=$exp_id -FIELD p2_version, p2 version +FIELD exp_id, 20, exposure ID, value, p2ProcessedImfile.php, exp_id=$exp_id +FIELD p1_version, 20, p1 version, value, p1PendingExp.php exp_id=$exp_id +FIELD p2_version, 20, p2 version Index: trunk/ippMonitor/def/p2ProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/p2ProcessedImfile.d (revision 9008) +++ trunk/ippMonitor/def/p2ProcessedImfile.d (revision 9009) @@ -5,13 +5,13 @@ # field name show link to extras -FIELD exp_id, exposure ID -FIELD class_id, class ID -FIELD uri, URI -FIELD recipe, recipe -FIELD bg, background -FIELD bg_stdev, background stdev -FIELD bg_mean_stdev, mean background stdev -FIELD b1_uri, URI small binned -FIELD b2_uri, URI large binned -FIELD p1_version, p1 version -FIELD p2_version, p2 version +FIELD exp_id, 20, exposure ID +FIELD class_id, 20, class ID +FIELD uri, 20, URI +FIELD recipe, 20, recipe +FIELD bg, 20, background +FIELD bg_stdev, 20, background stdev +FIELD bg_mean_stdev, 20, mean background stdev +FIELD b1_uri, 20, URI small binned +FIELD b2_uri, 20, URI large binned +FIELD p1_version, 20, p1 version +FIELD p2_version, 20, p2 version Index: trunk/ippMonitor/def/p3PendingExp.d =================================================================== --- trunk/ippMonitor/def/p3PendingExp.d (revision 9008) +++ trunk/ippMonitor/def/p3PendingExp.d (revision 9009) @@ -5,5 +5,5 @@ # field name show link to extras -FIELD exp_id, exposure ID, value, p2ProcessedImfile.php, exp_id=$exp_id -FIELD p2_version, p2 version, value, p2ProcessedExp.php, exp_id=$exp_id -FIELD p3_version, p3 version +FIELD exp_id, 20, exposure ID, value, p2ProcessedImfile.php, exp_id=$exp_id +FIELD p2_version, 20, p2 version, value, p2ProcessedExp.php, exp_id=$exp_id +FIELD p3_version, 20, p3 version Index: trunk/ippMonitor/def/pzPendingExp.d =================================================================== --- trunk/ippMonitor/def/pzPendingExp.d (revision 9008) +++ trunk/ippMonitor/def/pzPendingExp.d (revision 9009) @@ -5,7 +5,7 @@ # field name show link to extras -FIELD exp_id, exposures ID -FIELD camera, camera -FIELD telescope, telescope -FIELD exp_type, type -FIELD imfiles, N files +FIELD exp_id, 20, exposures ID +FIELD camera, 20, camera +FIELD telescope, 20, telescope +FIELD exp_type, 20, type +FIELD imfiles, 20, N files Index: trunk/ippMonitor/def/pzPendingImfile.d =================================================================== --- trunk/ippMonitor/def/pzPendingImfile.d (revision 9008) +++ trunk/ippMonitor/def/pzPendingImfile.d (revision 9009) @@ -5,8 +5,8 @@ # field name show link to extras -FIELD exp_id, exposure ID -FIELD bytes, number of bytes -FIELD md5sum, checksum -FIELD class, class -FIELD class_id, class ID -FIELD uri, URI +FIELD exp_id, 20, exposure ID +FIELD bytes, 20, number of bytes +FIELD md5sum, 20, checksum +FIELD class, 20, class +FIELD class_id, 20, class ID +FIELD uri, 20, URI Index: trunk/ippMonitor/def/rawDetrendExp.d =================================================================== --- trunk/ippMonitor/def/rawDetrendExp.d (revision 9008) +++ trunk/ippMonitor/def/rawDetrendExp.d (revision 9009) @@ -5,19 +5,19 @@ # field name show link to extras -FIELD exp_id, exposure ID, value, rawImfile.php, exp_id=$exp_id -FIELD telescope, Telescope -FIELD camera, Camera -FIELD exp_type, Type -FIELD filter, FILTER -# FIELD imfiles, imfiles -# FIELD airmass, airmass -# FIELD ra, ra -# FIELD decl, decl -# FIELD exp_time, exp_time -# FIELD bg, bg -# FIELD bg_stdev, bg_stdev -# FIELD bg_mean_stdev, bg_mean_stdev -# FIELD alt, alt -# FIELD az, az -# FIELD ccd_temp, ccd_temp -# FIELD posang, posang +FIELD exp_id, 20, exposure ID, value, rawImfile.php, exp_id=$exp_id +FIELD telescope, 20, Telescope +FIELD camera, 20, Camera +FIELD exp_type, 20, Type +FIELD filter, 20, FILTER +# 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 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 Index: trunk/ippMonitor/def/rawImfile.d =================================================================== --- trunk/ippMonitor/def/rawImfile.d (revision 9008) +++ trunk/ippMonitor/def/rawImfile.d (revision 9009) @@ -8,19 +8,19 @@ # field name show link to extras -FIELD exp_id, Exposure ID -FIELD class, Class -FIELD class_id, Class ID -# FIELD uri, uri -# FIELD exp_type, exp_type -# FIELD filter, filter -# FIELD airmass, airmass -# FIELD ra, ra -# FIELD decl, decl -# FIELD exp_time, exp_time -# FIELD bg, bg -# FIELD bg_stdev, bg_stdev -# FIELD bg_mean_stdev, bg_mean_stdev -# FIELD alt, alt -# FIELD az, az -# FIELD ccd_temp, ccd_temp -# FIELD posang, posang +FIELD exp_id, 20, Exposure ID +FIELD class, 20, Class +FIELD class_id, 20, Class ID +# FIELD uri, 20, uri +# FIELD exp_type, 20, exp_type +# FIELD filter, 20, filter +# 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 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 Index: trunk/ippMonitor/def/rawScienceExp.d =================================================================== --- trunk/ippMonitor/def/rawScienceExp.d (revision 9008) +++ trunk/ippMonitor/def/rawScienceExp.d (revision 9009) @@ -5,19 +5,19 @@ # field name show link to extras -FIELD exp_id, exposure ID, value, rawImfile.php, exp_id=$exp_id,camera=$camera,foo=bar -FIELD telescope, Telescope, value, telescopes.php -FIELD camera, Camera -FIELD exp_type, Type -FIELD filter, FILTER -# FIELD imfiles, imfiles -# FIELD airmass, airmass -# FIELD ra, ra -# FIELD decl, decl -# FIELD exp_time, exp_time -# FIELD bg, bg -# FIELD bg_stdev, bg_stdev -# FIELD bg_mean_stdev, bg_mean_stdev -# FIELD alt, alt -# FIELD az, az -# FIELD ccd_temp, ccd_temp -# FIELD posang, posang +FIELD exp_id, 20, exposure ID, value, rawImfile.php, exp_id=$exp_id,camera=$camera,foo=bar +FIELD telescope, 20, Telescope, value, telescopes.php +FIELD camera, 20, Camera +FIELD exp_type, 20, Type +FIELD filter, 20, FILTER +# 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 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 Index: trunk/ippMonitor/def/summitExp.d =================================================================== --- trunk/ippMonitor/def/summitExp.d (revision 9008) +++ trunk/ippMonitor/def/summitExp.d (revision 9009) @@ -5,7 +5,7 @@ # field name show link to extras -FIELD exp_id, exposure ID -FIELD camera, camera -FIELD telescope, telescope -FIELD exp_type, type -FIELD uri, URI +FIELD exp_id, 20, exposure ID +FIELD camera, 20, camera +FIELD telescope, 20, telescope +FIELD exp_type, 20, type +FIELD uri, 20, URI Index: trunk/ippMonitor/generate =================================================================== --- trunk/ippMonitor/generate (revision 9008) +++ trunk/ippMonitor/generate (revision 9009) @@ -12,6 +12,6 @@ # global variables: # @key, @value : paired list of keys and values -# @field, @name, @show, @link, @extras : properties of each table column # @headcode, @tailcode : additional HTML or PHP code before or after table +# @field, @width, @name, @show, @link, @extras : properties of each table column &parse_schema; @@ -44,5 +44,6 @@ # list of the table fields if ($key eq "FIELD") { - ($field, $name, $show, $link, $extras) = split (/,\s+/, $value, 5); + ($field, $width, $name, $show, $link, $extras) = split (/,\s+/, $value, 6); + if (! $name) { die "table $ARGV[0] missing required elements\n"; } # ($field) = $field =~ m|\s*(\S+)\s*|; @@ -50,4 +51,5 @@ if ($show eq "") {$show = "value";} push @field, $field; + push @width, $width; push @name, $name; push @show, $show; @@ -250,5 +252,5 @@ printf FILE "echo \"   \\n\";\n"; } else { - printf FILE "write_query_row ('$field[$i]');\n"; + printf FILE "write_query_row ('$field[$i]', $width[$i]);\n"; } } Index: trunk/ippMonitor/raw/ipp.detrend.dat =================================================================== --- trunk/ippMonitor/raw/ipp.detrend.dat (revision 9008) +++ trunk/ippMonitor/raw/ipp.detrend.dat (revision 9009) @@ -24,8 +24,7 @@ menutop | menutop | plain |   | menulink | menuselect | link | Master Detrend Images | masterDetrendImages.php -menulink | menuselect | link | Det Run | detRun.php -menulink | menuselect | link | Det Run Summary | detRunSummary.php -menulink | menuselect | link | Det Input Exp | detInputExp.php -menulink | menuselect | link | Det Resid Exp | detResidExp.php +menulink | menuselect | link | Detrend Runs | detRunSummary.php +menulink | menuselect | link | Input Detrend Exp | detInputExp.php +menulink | menuselect | link | Resid Detrend Exp | detResidExp.php menutop | menutop | plain |   | Index: trunk/ippMonitor/raw/ipp.php =================================================================== --- trunk/ippMonitor/raw/ipp.php (revision 9008) +++ trunk/ippMonitor/raw/ipp.php (revision 9009) @@ -19,5 +19,5 @@ // connect to the database require_once('DB.php'); -# $db = DB::connect("mysql://ipp:ipp@localhost/ipp"); + // $db = DB::connect("mysql://ipp:ipp@localhost/ipp"); $db = DB::connect("mysql://ipp:ipp@localhost/detrend"); if (DB::iserror($db)) { @@ -81,4 +81,9 @@ $ID['menu'] = $_GET[menu]; // echo "using GET: ", $ID['pass'], $ID['proj']; + + // echo "GET list
\n"; + // foreach ($_GET as $key => $value) { + // echo "$key : $value
\n"; + // } } if ($_SERVER[REQUEST_METHOD] == 'POST') { @@ -87,4 +92,9 @@ $ID['menu'] = $_POST[menu]; // echo "using POST: ", $ID['pass'], $ID['proj']; + + // echo "POST list
\n"; + // foreach ($_POST as $key => $value) { + // echo "$key : $value
\n"; + // } } @@ -178,10 +188,10 @@ function check_restrict ($key, $where) { - // echo "key: $key
\n"; + $htmlkey = preg_replace ('|\.|', '_', $key); if ($_SERVER[REQUEST_METHOD] == 'GET') { - $value = $_GET[$key]; + $value = $_GET[$htmlkey]; // echo "using GET
\n"; } else { - $value = $_POST[$key]; + $value = $_POST[$htmlkey]; // echo "using POST
\n"; } @@ -199,14 +209,16 @@ } -function write_query_row ($key) { - $value = $_POST[$key]; +function write_query_row ($key, $width) { + $htmlkey = preg_replace ('|\.|', '_', $key); + $value = $_POST[$htmlkey]; if (($_SERVER[REQUEST_METHOD] == 'POST') && $value) { - echo " \n"; + echo " \n"; } else { - echo " \n"; + echo " \n"; } } // expect image supplied with key=name +// this function should define matching hidden inputs in the form function insert_image ($key) {