Index: trunk/ippMonitor/def/camPendingExp.d
===================================================================
--- trunk/ippMonitor/def/camPendingExp.d (revision 12083)
+++ trunk/ippMonitor/def/camPendingExp.d (revision 12835)
@@ -1,9 +1,11 @@
-TABLE camPendingExp
-TITLE camPendingExp
+TABLE camPendingExp, chipProcessedExp
+TITLE Camera Pending
FILE camPendingExp.php
MENU ipp.science.dat
-# field name show link to extras
-FIELD exp_tag, 20, exposure ID, value, chipProcessedImfile.php, exp_tag=$exp_tag
-FIELD chip_version, 20, chip version, value, chipProcessedExp.php, exp_tag=$exp_tag
-FIELD cam_version, 20, cam version
+WHERE camPendingExp.chip_id = chipProcessedExp.chip_id
+
+# field size name show link to extras
+FIELD chipProcessedExp.exp_tag, 20, exposure ID, value, chipProcessedImfile.php, chipProcessedExp.exp_tag=$chipProcessedExp.exp_tag
+FIELD camPendingExp.chip_id, 20, chip ID, value, chipProcessedExp.php, exp_tag=$chipProcessedExp.exp_tag
+FIELD camPendingExp.cam_id, 20, cam ID
Index: trunk/ippMonitor/def/camProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/camProcessedExp.d (revision 12083)
+++ trunk/ippMonitor/def/camProcessedExp.d (revision 12835)
@@ -1,13 +1,15 @@
-TABLE camProcessedExp
-TITLE camProcessedExp
+TABLE camProcessedExp, chipProcessedExp
+TITLE Camera-Level Processed Exposures
FILE camProcessedExp.php
MENU ipp.science.dat
-# field size name show link to extras
-FIELD exp_tag, 15, Exposure, value
-FIELD image, 8, image, image=$path_base@PPIMAGE.JPEG2, chipProcessedImfile.php, exp_tag=$exp_tag,image=$path_base@PPIMAGE.JPEG1
-FIELD bg, 8, backgnd, value
-FIELD bg_mean_stdev, 8, [stdev], value
-FIELD bg_stdev, 8, stdev, value
-FIELD path_base, 20, path_base, none
-#FIELD recipe, 15, Recipe, value
+WHERE camProcessedExp.chip_id = chipProcessedExp.chip_id
+
+# field size name show link to extras
+FIELD chipProcessedExp.exp_tag, 15, Exposure, value
+FIELD *, 8, image, image=$camProcessedExp.path_base@PPIMAGE.JPEG2, chipProcessedImfile.php, exp_tag=$chipProcessedExp.exp_tag,image=$$camProcessedExp.path_base@PPIMAGE.JPEG1
+FIELD camProcessedExp.bg, 8, backgnd, value
+FIELD camProcessedExp.bg_mean_stdev, 8, [stdev], value
+FIELD camProcessedExp.bg_stdev, 8, stdev, value
+FIELD camProcessedExp.path_base, 20, path_base, value
+FIELD camProcessedExp.uri, 20, uri, value
Index: trunk/ippMonitor/def/chipPendingExp.d
===================================================================
--- trunk/ippMonitor/def/chipPendingExp.d (revision 12083)
+++ trunk/ippMonitor/def/chipPendingExp.d (revision 12835)
@@ -4,7 +4,7 @@
MENU ipp.science.dat
-# field name show link to extras
-FIELD exp_tag, 20, exposure ID, value, rawImfile.php, exp_tag=$exp_tag
-FIELD recipe, 20, recipe
-FIELD guide_version, 20, guide version
-FIELD chip_version, 20, chip version
+# field size name show link to extras
+FIELD chip_id, 20, chip ID
+FIELD exp_tag, 20, exposure ID, value, rawImfile.php, exp_tag=$exp_tag
+FIELD recipe, 20, recipe
+FIELD guide_id, 20, guide ID
Index: trunk/ippMonitor/def/chipProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/chipProcessedExp.d (revision 12083)
+++ trunk/ippMonitor/def/chipProcessedExp.d (revision 12835)
@@ -4,6 +4,8 @@
MENU ipp.science.dat
-# field name show link to extras
-FIELD exp_tag, 20, exposure ID, value, chipProcessedImfile.php, exp_tag=$exp_tag
-FIELD guide_version, 20, guide version, value, guidePendingExp.php exp_tag=$exp_tag
-FIELD chip_version, 20, chip version
+# field name show link to extras
+FIELD exp_tag, 20, exposure ID, value, chipProcessedImfile.php, exp_tag=$exp_tag
+FIELD chip_id, 20, Chip ID
+FIELD guide_id, 20, guide ID, value, guideProcessedExp.php, exp_tag=$exp_tag
+FIELD label, 20, label
+FIELD workdir, 20, workdir
Index: trunk/ippMonitor/def/chipProcessedImfile.d
===================================================================
--- trunk/ippMonitor/def/chipProcessedImfile.d (revision 12083)
+++ trunk/ippMonitor/def/chipProcessedImfile.d (revision 12835)
@@ -1,18 +1,15 @@
-TABLE chipProcessedImfile
+TABLE chipProcessedImfile, chipProcessedExp
TITLE chipProcessedImfile
FILE chipProcessedImfile.php
MENU ipp.imfiles.dat
-# field size name show link to extras
-FIELD exp_tag, 15, Exposure
-FIELD class_id, 8, Chip ID
-FIELD bg, 8, backgnd
-FIELD bg_mean_stdev, 8, [stdev]
-FIELD bg_stdev, 8, stdev
-#FIELD guide_version, 20, guide version
-#FIELD chip_version, 20, chip version
-#FIELD recipe, 20, recipe
-#FIELD uri, 20, URI
-#FIELD path_base, 20, URI path base
+WHERE chipProcessedImfile.chip_id = chipProcessedExp.chip_id
+
+# field size name show link to extras
+FIELD chipProcessedExp.exp_tag, 15, Exposure
+FIELD chipProcessedImfile.class_id, 8, Chip ID
+FIELD chipProcessedImfile.bg, 8, backgnd
+FIELD chipProcessedImfile.bg_mean_stdev, 8, [stdev]
+FIELD chipProcessedImfile.bg_stdev, 8, stdev
TAIL PHP insert_image ('image');
Index: trunk/ippMonitor/def/detNormalizedExp.d
===================================================================
--- trunk/ippMonitor/def/detNormalizedExp.d (revision 12083)
+++ trunk/ippMonitor/def/detNormalizedExp.d (revision 12835)
@@ -10,5 +10,5 @@
FIELD bg_stdev, 8, stdev
FIELD iteration, 5, iteration
-FIELD image, 8, image, image=$path_base@PPIMAGE.JPEG2, detNormalizedImfile.php, det_id=$det_id,iteration=$iteration,image=$path_base@PPIMAGE.JPEG1
-#FIELD path_base, 20, path_base
+FIELD *, 8, image, image=$path_base@PPIMAGE.JPEG2, detNormalizedImfile.php, det_id=$det_id,iteration=$iteration,image=$path_base@PPIMAGE.JPEG1
+FIELD path_base, 20, path_base, none
#FIELD recipe, 20, recipe
Index: trunk/ippMonitor/def/detProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/detProcessedExp.d (revision 12083)
+++ trunk/ippMonitor/def/detProcessedExp.d (revision 12835)
@@ -7,5 +7,5 @@
FIELD det_id, 7, Det ID, value
FIELD exp_tag, 15, Exposure, value
-FIELD image, 8, image, image=$path_base@PPIMAGE.JPEG2, detProcessedImfile.php, det_id=$det_id,exp_tag=$exp_tag,image=$path_base@PPIMAGE.JPEG1
+FIELD *, 8, image, image=$path_base@PPIMAGE.JPEG2, detProcessedImfile.php, det_id=$det_id,exp_tag=$exp_tag,image=$path_base@PPIMAGE.JPEG1
FIELD bg, 8, backgnd, value
FIELD bg_mean_stdev, 8, [stdev], value
Index: trunk/ippMonitor/def/detResidExp.d
===================================================================
--- trunk/ippMonitor/def/detResidExp.d (revision 12083)
+++ trunk/ippMonitor/def/detResidExp.d (revision 12835)
@@ -7,9 +7,9 @@
FIELD det_id, 7, Det ID, value
FIELD exp_tag, 15, Exposure, value, rawImfile.php, exp_tag=$exp_tag
-FIELD image, 8, image, image=$path_base@PPIMAGE.JPEG2, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=$path_base@PPIMAGE.JPEG1
FIELD bg, 8, backgnd, value
FIELD bg_mean_stdev, 8, [stdev]
FIELD bg_stdev, 8, stdev, value
FIELD iteration, 5, iter, value
+FIELD *, 8, image, image=$path_base@PPIMAGE.JPEG2, detResidImfile.php, det_id=$det_id,iteration=$iteration,exp_tag=$exp_tag,image=$path_base@PPIMAGE.JPEG1
FIELD accept, 4, keep, value
FIELD path_base, 20, path_base, none
Index: trunk/ippMonitor/def/detRun.d
===================================================================
--- trunk/ippMonitor/def/detRun.d (revision 12083)
+++ trunk/ippMonitor/def/detRun.d (revision 12835)
@@ -5,17 +5,19 @@
# field width name show link to extras
-FIELD det_id, 7, det ID, value, detRunSummary.php, det_id=$det_id
-FIELD iteration, 5, iteration
-FIELD det_type, 8, det_type
-FIELD state, 5, state
-FIELD mode, 5, mode
-FIELD exp_type, 8, exp_type (drop)
-FIELD filter, 10, filter
-FIELD airmass, 10, airmass
-FIELD exp_time, 10, exp_time
-FIELD ccd_temp, 10, ccd_temp
-FIELD posang, 10, posang
-FIELD object, 10, object
-FIELD registered, 10, registered
-FIELD use_begin, 10, use_begin
-FIELD use_end, 10, use_end
+FIELD det_id, 7, det ID, value, detRunSummary.php, det_id=$det_id
+FIELD iteration, 5, iteration
+FIELD det_type, 8, det_type
+FIELD state, 5, state
+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
Index: trunk/ippMonitor/def/warpInputExp.d
===================================================================
--- trunk/ippMonitor/def/warpInputExp.d (revision 12083)
+++ trunk/ippMonitor/def/warpInputExp.d (revision 12835)
@@ -1,10 +1,14 @@
-TABLE warpInputExp
+TABLE warpInputExp, camProcessedExp, chipProcessedExp
TITLE warpInputExp
FILE warpInputExp.php
MENU ipp.warp.dat
-# field name show link to extras
-FIELD warp_id, 20, warp ID
-FIELD exp_tag, 20, exposure tag
-FIELD cam_version, 20, cam version
-FIELD magiced, 20, magic done?
+WHERE warpInputExp.cam_id = camProcessedExp.cam_id
+WHERE camProcessedExp.chip_id = chipProcessedExp.chip_id
+
+# field size name show link to extras
+FIELD warpInputExp.warp_id, 20, warp ID
+FIELD chipProcessedExp.exp_tag, 20, exp tag
+FIELD chipProcessedExp.chip_id, 20, chip ID
+FIELD camProcessedExp.cam_id, 20, cam ID
+FIELD magiced, 5, magic?
Index: trunk/ippMonitor/def/warpSkycellMap.d
===================================================================
--- trunk/ippMonitor/def/warpSkycellMap.d (revision 12083)
+++ trunk/ippMonitor/def/warpSkycellMap.d (revision 12835)
@@ -1,12 +1,14 @@
-TABLE warpSkyCellMap
+TABLE warpSkyCellMap, camProcessedExp, chipProcessedExp
TITLE warpSkyCellMap
FILE warpSkyCellMap.php
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 exp_tag, 20, exposure tag
-FIELD cam_version, 20, cam version
-FIELD class_id, 20, class ID
+WHERE warpSkyCellMap.cam_id = camProcessedExp.cam_id
+WHERE camProcessedExp.chip_id = chipProcessedExp.chip_id
+
+# field size name show link to extras
+FIELD warpSkyCellMap.warp_id, 20, warp ID
+FIELD warpSkyCellMap.skycell_id, 20, skycell ID
+FIELD warpSkyCellMap.tess_id, 20, tessellation ID
+FIELD chipProcessedExp.exp_tag, 20, exposure tag
+FIELD warpSkyCellMap.class_id, 20, class ID
Index: trunk/ippMonitor/raw/ipp.css
===================================================================
--- trunk/ippMonitor/raw/ipp.css (revision 12083)
+++ trunk/ippMonitor/raw/ipp.css (revision 12835)
@@ -50,4 +50,36 @@
}
+table.select { text-align: left;
+ font-size: small;
+ font-weight: normal;
+ background: #0080c0;
+ border: 1px solid #0080c0;
+ padding: 0px;
+}
+
+td.select {
+ text-align: left;
+ font-size: normal;
+ font-weight: bold;
+ vertical-align: top;
+ color: #ffffff;
+ background: #0080c0;
+ background-color: #0080c0;
+ border: 2px solid #0080c0;
+ padding: 2px;
+}
+
+th.select {
+ text-align: left;
+ font-size: normal;
+ font-weight: bold;
+ vertical-align: top;
+ color: #000000;
+ background: #d0d0ff;
+ background-color: #d0d0ff;
+ border: 0px solid #0080c0;
+ padding: 2px;
+}
+
table.list { text-align: left;
font-size: small;
Index: trunk/ippMonitor/raw/ipp.php
===================================================================
--- trunk/ippMonitor/raw/ipp.php (revision 12083)
+++ trunk/ippMonitor/raw/ipp.php (revision 12835)
@@ -28,4 +28,22 @@
echo "\n";
+ $db = dbconnect('ippadmin');
+
+ // make this a DB lookup
+ $sql = "SELECT projname FROM projects";
+
+ $qry = $db->query($sql);
+ if (DB::iserror($db)) {
+ echo "error reading project list
\n";
+ menu_end();
+ }
+
+ echo "\n";
+ echo "| projects |
|---|
\n";
+ while ($qry->fetchInto($row)) {
+ echo "| $row[0] |
\n";
+ }
+ echo "
\n";
+
menu_end ();
}
@@ -34,9 +52,13 @@
// connect to the database
+ // these should be set on installation
require_once('DB.php');
- $db = DB::connect("mysql://ipp:ipp@alala/$database");
+ $password = "ipp";
+ $username = "ipp";
+ $hostname = "alala";
+ $db = DB::connect("mysql://$username:$password@$hostname/$database");
if (DB::iserror($db)) {
echo "error accessing database
\n";
- echo "tried mysql://ipp:ipp@localhost/ipp
\n";
+ echo "tried mysql://$username:$password@$hostname/$database
\n";
menu_end();
}
@@ -57,5 +79,5 @@
$db = dbconnect('ippadmin');
- // make this a DB lookup
+ // get the users from the DB
$sql = "SELECT username FROM users WHERE username = '$username' AND password = '$password'";
@@ -227,7 +249,7 @@
}
- $this = $_SERVER[SCRIPT_NAME];
+ $thisname = $_SERVER[SCRIPT_NAME];
$page = "$root/" . $base;
- if ($page == $this) {
+ if ($page == $thisname) {
$style = trim($line[1]);
} else {
Index: trunk/ippMonitor/raw/ipp.science.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.science.dat (revision 12083)
+++ trunk/ippMonitor/raw/ipp.science.dat (revision 12835)
@@ -27,9 +27,9 @@
menutop | menutop | plain | |
-menulink | menuselect | plain | Guide Processed Exp |
+menutop | menuselect | plain | Guide Processed Exp |
menulink | menuselect | link | Chip Processed Exp | chipProcessedExp.php
menulink | menuselect | link | Cam Processed Exp | camProcessedExp.php
menutop | menutop | plain | |
-menulink | menuselect | link | Guide Pending Exp | guidePendingExp.php
+menutop | menuselect | plain | Guide Pending Exp | guidePendingExp.php
menulink | menuselect | link | Chip Pending Exp | chipPendingExp.php
menulink | menuselect | link | Cam Pending Exp | camPendingExp.php