\n";
+
// query the database
if ($WHERE) {
@@ -27,4 +29,6 @@
}
+echo "SQL: $sql
\n";
+
$qry = $db->query($sql);
if (DB::iserror($db)) {
@@ -33,5 +37,5 @@
}
-// ** BODY HTML **
+// ** HEAD CODE **
// set up the table and form
@@ -72,5 +76,5 @@
echo "\n";
-// ** TAIL HTML **
+// ** TAIL CODE **
menu_end();
Index: trunk/ippMonitor/def/detInputExp.d
===================================================================
--- trunk/ippMonitor/def/detInputExp.d (revision 9003)
+++ trunk/ippMonitor/def/detInputExp.d (revision 9008)
@@ -4,7 +4,7 @@
MENU ipp.detrend.dat
-BODY.HTML test 1
-BODY.HTML test 2
-BODY.HTML test 3
+HEAD HTML test head 1
+HEAD HTML test head 2
+HEAD HTML test head 3
# field name show link to extras
@@ -15,5 +15,5 @@
FIELD include, include
-TAIL.HTML test tail 1
-TAIL.HTML test tail 2
-TAIL.HTML test tail 3
+TAIL HTML test tail 1
+TAIL HTML test tail 2
+TAIL HTML test tail 3
Index: trunk/ippMonitor/def/detResidExp.d
===================================================================
--- trunk/ippMonitor/def/detResidExp.d (revision 9003)
+++ trunk/ippMonitor/def/detResidExp.d (revision 9008)
@@ -4,13 +4,13 @@
MENU ipp.detrend.dat
-# field name show link to extras
+# 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 b1_uri, b1_uri, image=$b1_uri, display.php, image=$b2_uri
-FIELD recipe, recipe, image=pic.png
+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 b2_uri, b2_uri, none
+FIELD b1_uri, b1_uri, none
# FIELD bg_mean_stdev, bg_mean_stdev
Index: trunk/ippMonitor/def/detResidImfile.d
===================================================================
--- trunk/ippMonitor/def/detResidImfile.d (revision 9003)
+++ trunk/ippMonitor/def/detResidImfile.d (revision 9008)
@@ -16,2 +16,4 @@
FIELD b1_uri, b1_uri
FIELD b2_uri, b2_uri
+
+TAIL PHP insert_image ('image');
Index: trunk/ippMonitor/def/masterDetrendImages.d
===================================================================
--- trunk/ippMonitor/def/masterDetrendImages.d (revision 9008)
+++ trunk/ippMonitor/def/masterDetrendImages.d (revision 9008)
@@ -0,0 +1,34 @@
+# this file is based on the detRunSummary.d file: it uses the same tables restricted to the
+# master detrend runs which have been accepted
+
+TABLE detRunSummary, detRun
+TITLE Master Detrend Images
+FILE masterDetrendImages.php
+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
+WHERE detRun.position = detRunSummary.det_id
+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
+
+# this file illustrates a simple inner join to generate the output table
+# assuming no other dynamic restrictions are added, this generates the following query:
+# SELECT detRunSummary.det_id,detRunSummary.iteration,detRunSummary.iteration,detRun.det_type,detRunSummary.bg,detRunSummary.bg_stdev \
+# FROM detRunSummary, detRun \
+# 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/generate
===================================================================
--- trunk/ippMonitor/generate (revision 9003)
+++ trunk/ippMonitor/generate (revision 9008)
@@ -9,4 +9,9 @@
$template = $ARGV[1];
$output = $ARGV[2];
+
+# 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
&parse_schema;
@@ -31,7 +36,7 @@
($key, $value) = split (" ", $line, 2);
- # strip white space from the following
- if ($key eq "TABLE") { ($value) = $value =~ m|\s*(\S+)\s*|; }
- if ($key eq "TYPE") { ($value) = $value =~ m|\s*(\S+)\s*|; }
+ # strip leading and trailing white space from the following
+ if ($key eq "TABLE") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
+ if ($key eq "TYPE") { ($value) = $value =~ m|^\s*(.+)\s*$|; }
&set_keypair ($key, $value);
@@ -52,20 +57,19 @@
# list of the table fields
- if ($key eq "BODY.HTML") {
- push @bodyhtml, $value;
+ if ($key eq "HEAD") {
+ push @headcode, $value;
}
# list of the table fields
- if ($key eq "TAIL.HTML") {
- push @tailhtml, $value;
+ if ($key eq "TAIL") {
+ push @tailcode, $value;
}
# list of the table restrictions
- if ($key eq "RESTRICT") {
+ # replace this with a flexible where statement?
+ if ($key eq "WHERE") {
($field) = split (/,\s+/, $value, 1);
- # ($field) = $field =~ m|\s*(\S+)\s*|;
-
if ($VERBOSE) { printf "%-20s\n", $field; }
- push @restrict, $field;
+ push @where, $field;
}
}
@@ -83,6 +87,8 @@
}
- # define query string, add to keypairs
- &define_query_fields;
+ # define FIELDS and WHERE strings, add to keypairs
+ &define_fields_count;
+ &define_fields_string (@field);
+ &define_where_string (@where);
if (0) {
@@ -139,12 +145,12 @@
}
- # fill in body HTML
- if ($line =~ m|// \*\* BODY HTML \*\*|) {
- &write_body_html;
- }
-
- # fill in tail HTML
- if ($line =~ m|// \*\* TAIL HTML \*\*|) {
- &write_tail_html;
+ # fill in head HTML or PHP code
+ if ($line =~ m|// \*\* HEAD CODE \*\*|) {
+ &write_inline_code (@headcode);
+ }
+
+ # fill in tail HTML or PHP code
+ if ($line =~ m|// \*\* TAIL CODE \*\*|) {
+ &write_inline_code (@tailcode);
}
}
@@ -152,28 +158,20 @@
}
-sub write_body_html {
- my ($i);
-
- if (@bodyhtml == 0) { return; }
- printf FILE "?>\n";
+sub write_inline_code {
+ my (@code) = @_;
+ my ($i, $code, $type);
- for ($i = 0; $i < @bodyhtml; $i++) {
- printf FILE "$bodyhtml[$i]\n";
- }
- printf FILE "\n";
-
- for ($i = 0; $i < @tailhtml; $i++) {
- printf FILE "$tailhtml[$i]\n";
- }
- printf FILE " $line ) for each field (show != none)
sub write_table_header {
@@ -184,25 +182,24 @@
}
+# generate a WHERE test for each field (field != *)
sub write_table_restrict {
- for ($i = 0; $i < @restrict; $i++) {
- $value = $restrict[$i];
- printf FILE "\$value = \$_GET['$value'];\n";
- printf FILE "if (\$value) {\n";
- printf FILE " if (\$WHERE) {\n";
- printf FILE " \$WHERE = \$WHERE . \" AND $value = '\$value'\";\n";
- printf FILE " } else {\n";
- printf FILE " \$WHERE = \"$value = '\$value'\";\n";
- printf FILE " }\n";
- printf FILE "}\n";
+ if ($WHERE) {
+ printf FILE "\$WHERE = \"$WHERE\";\n";
+ }
+ for ($i = 0; $i < @field; $i++) {
+ $value = $field[$i];
+ if ($value eq "*") { next; }
+ printf FILE "\$WHERE = check_restrict ('$value', \$WHERE);\n";
}
}
sub write_table_data {
- my ($i);
+ my ($i, $Nrow);
my ($label, $value, $string);
for ($i = 0; $i < @field; $i++) {
($label, $value, $string) = &parse_label ($show[$i]);
+ $Nrow = $count[$i];
# create the link variable if this entry should be linked
@@ -211,5 +208,5 @@
if (($label eq "value") && !$link[$i]) {
# print value without link or image
- if (! $value) { $value = "\$row[$i]"; }
+ if (! $value && ($field[$i] ne "*")) { $value = "\$row[$Nrow]"; }
print FILE " echo \"
$value
\\n\";\n";
next;
@@ -222,5 +219,5 @@
if ($extras[$i]) { &parse_extras ($extras[$i]); }
# print the actual table cell line with the link...
- if (! $value) { $value = "\$row[$i]"; }
+ if (! $value && ($field[$i] ne "*")) { $value = "\$row[$Nrow]"; }
printf FILE " echo \"