Index: branches/eam_branches/ipp-20101205/ippMonitor/Makefile.in =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/Makefile.in (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/Makefile.in (revision 30579) @@ -43,4 +43,6 @@ $(DESTWWW)/ipp.stack.dat \ $(DESTWWW)/ipp.stack.php \ +$(DESTWWW)/ipp.dvodb.dat \ +$(DESTWWW)/ipp.dvodb.php \ $(DESTWWW)/phptest.php \ $(DESTWWW)/site.php \ @@ -59,4 +61,5 @@ $(DESTWWW)/show_and_delete_image.php \ $(DESTWWW)/scatterPlot.php \ +$(DESTWWW)/rawBurntoolState.php \ $(DESTWWW)/plotHistogram.php \ $(DESTWWW)/columns_in_db.php \ @@ -65,5 +68,8 @@ $(DESTWWW)/warpProcessedExp.php \ $(DESTWWW)/diskUsage.php \ -$(DESTWWW)/version.php +$(DESTWWW)/version.php + + + DEFSRC = \ @@ -211,5 +217,12 @@ $(DESTWWW)/exposureStatus.php \ $(DESTWWW)/mopsStatus.php \ -$(DESTWWW)/gpc1MysqlProcessList.php +$(DESTWWW)/gpc1MysqlProcessList.php \ +$(DESTWWW)/minidvodbRun.php \ +$(DESTWWW)/minidvodbCopy.php \ +$(DESTWWW)/minidvodbProcessed.php \ +$(DESTWWW)/addRunRun.php \ +$(DESTWWW)/addRunProcessed.php + + PICTURES = \ Index: branches/eam_branches/ipp-20101205/ippMonitor/def/addRunProcessed.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/addRunProcessed.d (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/addRunProcessed.d (revision 30579) @@ -0,0 +1,31 @@ +TABLE addRun, addProcessedExp +TITLE Processed addRuns +FILE addRunProcessed.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +WHERE addRun.add_id = addProcessedExp.add_id + +# field size format name show link to extras +FIELD distinct(addRun.add_id), 5, %d, add ID + +FIELD addRun.cam_id, 5, %d, cam ID +FIELD addRun.state, 5, %s, state +FIELD addProcessedExp.fault, 5, %d, fault +FIELD addProcessedExp.dtime_addstar, 5, %d, addstar time + +FIELD addProcessedExp.path_base, 5, %s, pathbase +FIELD addRun.reduction, 5, %s, reduction +FIELD addRun.label, 5, %s, label +FIELD addRun.data_group, 5, %s, data_group +FIELD addRun.dvodb, 5, %s, dvodb +FIELD addProcessedExp.dvodb_path, 5, %s, dvodb_path + +FIELD addRun.note, 5, %s, note +FIELD addRun.image_only, 5, %d, image_only +FIELD addRun.minidvodb, 5, %d, minidvodb +FIELD addRun.minidvodb_group, 5, %s, minidvodb_group +FIELD addRun.minidvodb_name, 5, %s, minidvodb_name + + Index: branches/eam_branches/ipp-20101205/ippMonitor/def/addRunRun.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/addRunRun.d (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/addRunRun.d (revision 30579) @@ -0,0 +1,27 @@ +TABLE addRun +TITLE addRuns +FILE addRunRun.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +WHERE add_id >= 0 + +# field size format name show link to extras +FIELD distinct(addRun.add_id), 5, %d, add ID + +FIELD addRun.cam_id, 5, %d, cam ID +FIELD addRun.add_id, 5, %d, add ID +FIELD addRun.state, 5, %s, state +FIELD addRun.workdir, 5, %s, workdir +FIELD addRun.reduction, 5, %s, reduction +FIELD addRun.label, 5, %s, label +FIELD addRun.data_group, 5, %s, data_group +FIELD addRun.dvodb, 5, %s, dvodb +FIELD addRun.note, 5, %s, note +FIELD addRun.image_only, 5, %d, image_only +FIELD addRun.minidvodb, 5, %d, minidvodb +FIELD addRun.minidvodb_group, 5, %s, minidvodb_group +FIELD addRun.minidvodb_name, 5, %s, minidvodb_name + + Index: branches/eam_branches/ipp-20101205/ippMonitor/def/diffProcessedSkyfile_Images.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/diffProcessedSkyfile_Images.d (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/diffProcessedSkyfile_Images.d (revision 30579) @@ -11,4 +11,7 @@ # IMAGE VAR basename filerule camera class_id IMAGE JPEG2 $diffSkyfile.path_base PPSUB.OUTPUT.JPEG2 GPC1 NONE + +# if no query restrictions are supplied, we want to limit the query or it is extremely long running: +UNRESTRICTED AND diffRun.diff_id = 0 # XXX need to get camera from lookup Index: branches/eam_branches/ipp-20101205/ippMonitor/def/magicProcessedMasks_Images.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/magicProcessedMasks_Images.d (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/magicProcessedMasks_Images.d (revision 30579) @@ -11,5 +11,6 @@ ARGS ARG7 magicRun.magic_id=$magicRun.magic_id ARGS ARG7 camera=GPC1 -ARGS ARG7 basename=$magicRun.workdir/$magicRun.exp_id/$magicRun.exp_id.mgc.$magicRun.magic_id.verify/$magicRun.exp_id +#ARGS ARG7 basename=$magicRun.workdir/$magicRun.exp_id/$magicRun.exp_id.mgc.$magicRun.magic_id.verify/$magicRun.exp_id +ARGS ARG7 basename=$magicMask.path_base # field size format name show link to extras @@ -25,4 +26,5 @@ FIELD magicMask.fault, 5, %d, Fault FIELD magicRun.workdir, 5, %s, Label, none +FIELD magicMask.path_base, 5, %s, Label, none TAIL PHP insert_image ('MAGIC.ORIGINAL.PNG', 'width=49%'); Index: branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbCopy.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbCopy.d (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbCopy.d (revision 30579) @@ -0,0 +1,19 @@ +TABLE minidvodbCopy +TITLE Minidvodb Copies +FILE minidvodbCopy.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +WHERE minidvodbcopy_id >= 0 + +# field size format name show link to extras +FIELD distinct(minidvodbCopy.minidvodbcopy_id), 5, %d, Minidvodb Copy ID +FIELD minidvodbCopy.minidvodb_id, 5, %d, Minidvodb ID +FIELD minidvodbCopy.minidvodb_rsync_path, 25, %s, rsync path +FIELD minidvodbCopy.destination_host, 5, %s, destinatin host +FIELD minidvodbCopy.fault, 5, %s, Fault +FIELD minidvodbCopy.state, 5, %s, State +FIELD minidvodbCopy.epoch, 5, %T, Epoch +FIELD minidvodbCopy.dtime, 5, %d, dtime + Index: branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbProcessed.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbProcessed.d (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbProcessed.d (revision 30579) @@ -0,0 +1,23 @@ +TABLE minidvodbRun, minidvodbProcessed +TITLE Processed minidvodbs +FILE minidvodbProcessed.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +WHERE minidvodbRun.minidvodb_id = minidvodbProcessed.minidvodb_id + +# field size format name show link to extras +FIELD distinct(minidvodbRun.minidvodb_id), 5, %d, Minidvodb ID + +FIELD minidvodbRun.minidvodb_name, 5, %s, minidvodb_name +FIELD minidvodbRun.minidvodb_group, 5, %s, minidvodb_group +FIELD minidvodbProcessed.merge_order, 5, %d, Merge Order +FIELD minidvodbProcessed.dtime_resort, 5, %d, resort time +FIELD minidvodbProcessed.dtime_relphot, 5, %d, relphot time +FIELD minidvodbProcessed.dtime_merge, 5, %d, dvomerge time +FIELD minidvodbProcessed.mergedvodb_path, 25, %s, mergedvodb_path +FIELD state, 5, %s, State +FIELD minidvodbProcessed.fault, 5, %d, Fault +FIELD epoch, 5, %T, epoch + Index: branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbRun.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbRun.d (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/minidvodbRun.d (revision 30579) @@ -0,0 +1,18 @@ +TABLE minidvodbRun +TITLE minidvodb Runs +FILE minidvodbRun.php +MENU ipp.dvodb.dat + +# the following WHERE clauses are added to all queries joined by AND + +WHERE minidvodb_id >= 0 + +# field size format name show link to extras +FIELD distinct(minidvodbRun.minidvodb_id), 5, %d, Minidvodb ID +FIELD minidvodbRun.minidvodb_name, 5, %s, minidvodb_name +FIELD minidvodbRun.minidvodb_group, 5, %s, minidvodb_group +FIELD minidvodbRun.minidvodb_path, 25, %s, minidvodb_path +FIELD minidvodbRun.mergedvodb_path, 25, %s, mergedvodb_path +FIELD state, 5, %s, State +FIELD creation_date, 5, %T, epoch + Index: branches/eam_branches/ipp-20101205/ippMonitor/def/rawBurntoolState.d =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/def/rawBurntoolState.d (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/def/rawBurntoolState.d (revision 30579) @@ -0,0 +1,19 @@ +TABLE rawImfile +TITLE Burntool States +FILE rawBurntoolState.php +MENU ipp.load.dat + +# field size format name show link to extras +FIELD exp_id, 5, %d, Exp ID, value +FIELD exp_name, 10, %s, Exp Name +FIELD dateobs, 19, %T, Date/Time +FIELD exp_type, 8, %s, Type +FIELD obs_mode, 8, %s, obs mode +FIELD burntool_state, 10, %s, Burntool State +FIELD fault, 5, %d, Fault +FIELD count(exp_id) as n, 7, %d, count + +MODE summary +GROUP exp_id +GROUP burntool_state +GROUP fault Index: branches/eam_branches/ipp-20101205/ippMonitor/raw/czartool_exposures.php =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/raw/czartool_exposures.php (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/raw/czartool_exposures.php (revision 30579) @@ -17,16 +17,34 @@ else {$myMenu = "ipp.imfiles.dat";} -menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']); - $pass = $ID['pass']; $proj = $ID['proj']; $menu = $ID['menu']; -$today = date("Y-m-d"); - +$date = $_POST['date']; +$survey = $_POST['survey']; + +// if no date chosen, use today +if ($date == "") $date = date("Y-m-d"); +if ($survey == "") $survey = ""; + +menu($myMenu, 'Exposure summary for '.$date , 'ipp.css', $ID['link'], $ID['proj']); + +// set up the form +echo "
\n"; + +echo "\n"; +echo "\n"; +echo "\n"; + + +echo ""; +echo "

Current status of all exposures taken on (UTC) "; +echo " for survey (leave blank for all surveys)"; +echo ""; echo "

"; -echo "

Current status of all exposures taken $today UTC

"; - -createTableForThisSurvey($gpc1db, $today, ""); + +echo "
\n"; + +createTableForThisSurvey($gpc1db, $date, $survey); menu_end(); @@ -58,5 +76,5 @@ $qry->fetchInto($count); - if ($surveyStr == "") $surveyText = "all surveys"; + if ($surveyStr == "") $surveyText = "all surveys"; else $surveyText = "$surveyStr survey"; @@ -83,34 +101,36 @@ $ssDiffProduced = array(); getSSDiffProduced($db, $date, $surveyStr, &$ssDiffProduced); - $class = "list"; - echo "\n"; + // create table + echo "
\n"; + + // table headers echo "\n"; - write_header_cell($class, ""); - write_header_cell($class, ""); - write_header_cell($class, ""); - write_header_cell($class, ""); - write_header_cell($class, "Raw"); - write_header_cell($class, "Chip"); - write_header_cell($class, "Camera"); - write_header_cell($class, "Warp"); - write_header_cell($class, "Stack"); - write_header_cell($class, "Warp-Stack Diff"); - write_header_cell($class, "Warp-Warp1 Diff"); - write_header_cell($class, "Warp-Warp2 Diff"); - write_header_cell($class, "Stack-Stack Diff"); + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; echo "\n"; - write_header_cell($class, "Exp ID"); - write_header_cell($class, "Exp Name"); - write_header_cell($class, "Filter"); - write_header_cell($class, "Comment"); - write_header_cell($class, "state"); - write_header_cell($class, "state/dist?"); - write_header_cell($class, "state/dist?"); - write_header_cell($class, "state/dist?"); - write_header_cell($class, "total/dist"); - write_header_cell($class, "total/dist"); - write_header_cell($class, "total/dist"); - write_header_cell($class, "total/dist"); - write_header_cell($class, "total/dist"); + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; $sql = @@ -147,49 +167,54 @@ echo "\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + // chip if (!$chipDist[$exp_id]) $chipDistStr = "N"; else $chipDistStr = $chipDist[$exp_id]; + echo ""; // cam if (!$camDist[$exp_id]) $camDistStr = "N"; else $camDistStr = $camDist[$exp_id]; + echo ""; // warp if (!$warpDist[$exp_id]) $warpDistStr = "N"; else $warpDistStr = $warpDist[$exp_id]; + echo ""; // stack - if (!$stack_hash[$exp_id] && !$stackDist[$exp_id]) $stackDistStr = ""; + if (!$stack_hash[$exp_id] && !$stackDist[$exp_id]) $stackDistStr = " "; else $stackDistStr = $stack_hash[$exp_id] . "/" . $stackDist[$exp_id]; + $color = getColour($stack_hash[$exp_id], $stackDist[$exp_id]); + echo ""; // WS diff - if (!$wsDiffProduced[$exp_id] && !$wsDiffDist[$exp_id]) $wsDistStr = ""; + if (!$wsDiffProduced[$exp_id] && !$wsDiffDist[$exp_id]) $wsDistStr = " "; else $wsDistStr = $wsDiffProduced[$exp_id] . "/" . $wsDiffDist[$exp_id]; + $color = getColour($wsDiffProduced[$exp_id], $wsDiffDist[$exp_id]); + echo ""; // WW1 diff - if (!$ww1DiffProduced[$exp_id] && !$ww1DiffDist[$exp_id]) $ww1DistStr = ""; + if (!$ww1DiffProduced[$exp_id] && !$ww1DiffDist[$exp_id]) $ww1DistStr = " "; else $ww1DistStr = $ww1DiffProduced[$exp_id] . "/" . $ww1DiffDist[$exp_id]; + $color = getColour($ww1DiffProduced[$exp_id], $ww1DiffDist[$exp_id]); + echo ""; // WW2 dist - if (!$ww2DiffProduced[$exp_id] && !$ww2DiffDist[$exp_id]) $ww2DistStr = ""; + if (!$ww2DiffProduced[$exp_id] && !$ww2DiffDist[$exp_id]) $ww2DistStr = " "; else $ww2DistStr = $ww2DiffProduced[$exp_id] . "/" . $ww2DiffDist[$exp_id]; + $color = getColour($ww2DiffProduced[$exp_id], $ww2DiffDist[$exp_id]); + echo ""; // SS dist - if (!$ssDiffProduced[$exp_id] && !$ssDiffDist[$exp_id]) $ssDistStr = ""; + if (!$ssDiffProduced[$exp_id] && !$ssDiffDist[$exp_id]) $ssDistStr = " "; else $ssDistStr = $ssDiffProduced[$exp_id] . "/" . $ssDiffDist[$exp_id]; - - write_table_cell($class, '%s', "", $exp_id); - write_table_cell($class, '%s', "", $exp_name); - write_table_cell($class, '%s', "", $filter); - write_table_cell($class, '%s', "", $comment); - write_table_cell($class, '%s', "", $rawExp); - write_table_cell($class, '%s', "", "$chipState/$chipDistStr"); - write_table_cell($class, '%s', "", "$camState/$camDistStr"); - write_table_cell($class, '%s', "", "$warpState/$warpDistStr"); - write_table_cell($class, '%s', "", $stackDistStr); - write_table_cell($class, '%s', "", $wsDistStr); - write_table_cell($class, '%s', "", $ww1DistStr); - write_table_cell($class, '%s', "", $ww2DistStr); - write_table_cell($class, '%s', "", $ssDistStr); + $color = getColour($ssDiffProduced[$exp_id], $ssDiffDist[$exp_id]); + echo ""; echo "\n"; @@ -199,4 +224,14 @@ } +########################################################################### +# +# Gets the right cell colour provided number created and distributed +# +########################################################################### +function getColour($created, $distributed) { + + if ($distributed > 0 && $created > 0 && $distributed % $created != 0) return "red"; + return ""; +} ########################################################################### Index: branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.dvodb.dat =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.dvodb.dat (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.dvodb.dat (revision 30579) @@ -0,0 +1,13 @@ +input | ipp.menu.dat + +menutop | menutop | plain |   | + +menulink | menuselect | link | addRun Runs | addRunRun.php +menulink | menuselect | link | addRun ProcessedExp | addRunProcessed.php + +menutop | menutop | plain |   | + +menulink | menuselect | link | minidvodbRun | minidvodbRun.php +menulink | menuselect | link | minidvodbProcessed | minidvodbProcessed.php +menulink | menuselect | link | minidvodbCopy | minidvodbCopy.php + Index: branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.dvodb.php =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.dvodb.php (revision 30579) +++ branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.dvodb.php (revision 30579) @@ -0,0 +1,17 @@ +\n"; + +menu_end(); + +?> Index: branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.load.dat =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.load.dat (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.load.dat (revision 30579) @@ -23,2 +23,4 @@ menulink | menuselect | link | New Imfile | newImfile.php menulink | menuselect | link | Raw Imfile | rawImfile.php +menutop | menutop | plain |   | +menulink | menuselect | link | Burntool State | rawBurntoolState.php Index: branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.menu.dat =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.menu.dat (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.menu.dat (revision 30579) @@ -23,4 +23,5 @@ menutop | menutop | link | Stack Steps | ipp.stack.php menutop | menutop | link | Distribution | ipp.dist.php +menutop | menutop | link | dvoDB | ipp.dvodb.php menutop | menutop | link | Calibration | ipp.cal.php menutop | menutop | link | Plots | ipp.plots.php Index: branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.php =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.php (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/raw/ipp.php (revision 30579) @@ -390,7 +390,7 @@ if ($sortKey == "") { if ($_SERVER[REQUEST_METHOD] == 'GET') { - $sortKey = $_GET['rsort']; + $sortVal = $_GET['rsort']; } else { - $sortKey = $_POST['rsort']; + $sortVal = $_POST['rsort']; } if ($sortVal != "") { @@ -529,4 +529,7 @@ $value = $_POST[$htmlkey]; } + # a search restriction may include an SQL wild-card. we have to mangle these so that the http + # does not get converted to a special character + $value = preg_replace ('|%|', '%25', $value); if ($value != "") { if ($line) { Index: branches/eam_branches/ipp-20101205/ippMonitor/scripts/generate =================================================================== --- branches/eam_branches/ipp-20101205/ippMonitor/scripts/generate (revision 30446) +++ branches/eam_branches/ipp-20101205/ippMonitor/scripts/generate (revision 30579) @@ -58,5 +58,5 @@ if ($key eq "FIELD") { ($field, $width, $format, $name, $show, $link, $extras) = split (/,\s+/, $value, 7); - if (! $name) { die "table $ARGV[0] missing required elements\n"; } + if (! $name) { die "table $ARGV[0] missing required elements: $value\n"; } if ($field =~ m|\S+\s+as\s+\S+|) { ($fieldreal) = $field =~ m|\S+\s+as\s+(\S+)|;
RawChipCameraWarpStackWarp-Stack DiffWarp-Warp1 DiffWarp-Warp2 DiffStack-Stack Diff
Exp IDExp NameFilterCommentstatestate/dist?state/dist?state/dist?total/disttotal/disttotal/disttotal/disttotal/dist
$exp_id$exp_name$filter$comment$rawExp$chipState/$chipDistStr$camState/$camDistStr$warpState/$warpDistStr$stackDistStr$wsDistStr$ww1DistStr$ww2DistStr$ssDistStr