Index: trunk/ippMonitor/Makefile.in =================================================================== --- trunk/ippMonitor/Makefile.in (revision 28964) +++ trunk/ippMonitor/Makefile.in (revision 28969) @@ -103,4 +103,5 @@ $(DESTWWW)/chipProcessedImfile.php \ $(DESTWWW)/chipProcessedImfile_failure.php \ +$(DESTWWW)/failedChipProcessedImfile.php \ $(DESTWWW)/camSummary.php \ $(DESTWWW)/camStageExp.php \ @@ -109,4 +110,5 @@ $(DESTWWW)/camProcessedExp_Images.php \ $(DESTWWW)/camProcessedExp_failure.php \ +$(DESTWWW)/failedCamProcessedExp.php \ $(DESTWWW)/camIQstats.php \ $(DESTWWW)/camProcessedImfile.php \ @@ -118,4 +120,5 @@ $(DESTWWW)/fakeProcessedImfile.php \ $(DESTWWW)/fakeProcessedImfile_failure.php \ +$(DESTWWW)/failedFakeProcessedImfile.php \ $(DESTWWW)/pzPendingExp.php \ $(DESTWWW)/pzPendingImfile.php \ @@ -142,4 +145,5 @@ $(DESTWWW)/warpProcessedSkyfiles.php \ $(DESTWWW)/warpFailedSkyfiles.php \ +$(DESTWWW)/failedWarpSkyfiles.php \ $(DESTWWW)/diffSummary.php \ $(DESTWWW)/diffSummary_Images.php \ @@ -148,5 +152,5 @@ $(DESTWWW)/diffProcessedSkyfile.php \ $(DESTWWW)/diffProcessedSkyfile_Images.php \ -$(DESTWWW)/diffFailedSkyfile.php \ +$(DESTWWW)/failedDiffSkyfile.php \ $(DESTWWW)/stackRun.php \ $(DESTWWW)/stackSummary.php \ @@ -156,4 +160,5 @@ $(DESTWWW)/stackProcessedSkyfile_Images.php \ $(DESTWWW)/stackFailedSkyfile.php \ +$(DESTWWW)/failedStackSkyfile.php \ $(DESTWWW)/staticskyRun.php \ $(DESTWWW)/staticskySummary.php \ @@ -168,6 +173,9 @@ $(DESTWWW)/magicProcessedMasks_Images.php \ $(DESTWWW)/magicFailedTrees.php \ +$(DESTWWW)/failedMagicTrees.php \ $(DESTWWW)/magicFailedNodes.php \ +$(DESTWWW)/failedMagicNodes.php \ $(DESTWWW)/magicFailedMasks.php \ +$(DESTWWW)/failedMagicMasks.php \ $(DESTWWW)/distSummary.php \ $(DESTWWW)/distTarget.php \ Index: trunk/ippMonitor/def/failedCamProcessedExp.d =================================================================== --- trunk/ippMonitor/def/failedCamProcessedExp.d (revision 28969) +++ trunk/ippMonitor/def/failedCamProcessedExp.d (revision 28969) @@ -0,0 +1,39 @@ +TABLE camRun, camProcessedExp, chipRun, rawExp +TITLE Camera Failed Exposures +FILE failedCamProcessedExp.php +MENU ipp.science.dat + +# the following WHERE clauses are added to all queries joined by AND +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE camProcessedExp.cam_id = camRun.cam_id +WHERE camProcessedExp.fault != 0 + +# define the arguments supplied to the links below (if any) +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id + +ARGS ARG4 camRun.cam_id=$camRun.cam_id +ARGS ARG4 camera=$rawExp.camera +ARGS ARG4 basename=$camProcessedExp.path_base + +OP OP1 ( $camProcessedExp.fault == 2 ? "cam.revert.on and cam.revert.off" : "camtool -revertprocessedexp -fault $camProcessedExp.fault -label $camRun.label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 5, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 5, %d, Cam ID, value, camProcessedExp_failure.php, ARG3 +FIELD camRun.state, 5, %s, state, value, camProcessedImfile.php, ARG4 +FIELD camRun.label, 5, %s, label +FIELD camRun.data_group, 5, %s, data grp +FIELD camRun.dist_group, 5, %s, dist grp +FIELD camProcessedExp.fault, 2, %d, Fault +FIELD *, 50, %s, Command (Experimental), op=OP1 + +FIELD camProcessedExp.path_base, 5, %s, path_base, none +FIELD rawExp.exp_id, 5, %s, Exp ID, none + + +TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/failedChipProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/failedChipProcessedImfile.d (revision 28969) +++ trunk/ippMonitor/def/failedChipProcessedImfile.d (revision 28969) @@ -0,0 +1,52 @@ +TABLE chipRun, rawExp, chipProcessedImfile +TITLE Chip Failed Imfiles +FILE failedChipProcessedImfile.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +WHERE chipRun.exp_id = rawExp.exp_id +WHERE chipProcessedImfile.exp_id = chipRun.exp_id +WHERE chipProcessedImfile.chip_id = chipRun.chip_id +WHERE chipProcessedImfile.fault != 0 + +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id + +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id + +ARGS ARG3 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 chipProcessedImfile.class_id=$chipProcessedImfile.class_id +ARGS ARG3 camera=$rawExp.camera +ARGS ARG3 basename=$chipProcessedImfile.path_base +ARGS ARG3 class=$chipProcessedImfile.class_id + +OP OP1 ( $chipProcessedImfile.fault == 2 ? "chip.revert.on and chip.revert.off" : "chiptool -revertprocessedimfile -fault $chipProcessedImfile.fault -label $chipRun.label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD chipProcessedImfile.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile_failure.php, ARG2 +FIELD chipRun.state, 7, %s, State, value, chipProcessedImfile_failure.php, ARG3 +FIELD chipRun.label, 7, %s, Label +FIELD chipRun.data_group, 7, %s, data grp +FIELD chipRun.dist_group, 7, %s, dist grp +FIELD chipProcessedImfile.fault, 2, %d, Fault +FIELD *, 50, %s, Command Experimental, op=OP1 + +# FIELD rawExp.telescope, 10, %s, Telescope +# FIELD rawExp.camera, 10, %s, Camera +# FIELD rawExp.dateobs, 19, %T, Date/Time +# FIELD rawExp.ra, 8, %C, RA, op=OP1 +# FIELD rawExp.decl, 8, %C, DEC, op=OP2 +# FIELD rawExp.object, 8, %s, Object +# FIELD rawExp.filter, 10, %s, FILTER +# FIELD rawExp.exp_time, 5, %.2f, exp_time +# FIELD rawExp.airmass, 5, %.4f, airmass +# FIELD chipProcessedImfile.bg, 5, %.2f, backgnd +# FIELD chipProcessedImfile.bg_stdev, 5, %.2f, stdev +# FIELD chipProcessedImfile.n_stars, 5, %d, Nstars +# FIELD chipProcessedImfile.fwhm_major, 5, %.2f, FHWM +# FIELD chipProcessedImfile.path_base, 5, %s, path_base, none +# FIELD rawExp.comment, 65, %s, Comment + +TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/failedDiffSkyfile.d =================================================================== --- trunk/ippMonitor/def/failedDiffSkyfile.d (revision 28969) +++ trunk/ippMonitor/def/failedDiffSkyfile.d (revision 28969) @@ -0,0 +1,30 @@ +TABLE diffRun, diffSkyfile +TITLE Diff Failed Skyfiles +FILE failedDiffSkyfile.php +MENU ipp.stack.dat + +WHERE diffRun.diff_id = diffSkyfile.diff_id +WHERE diffSkyfile.fault != 0 + +ARGS ARG7 diffSkyfile.diff_id=$diffSkyfile.diff_id +ARGS ARG7 diffSkyfile.skycell_id=$diffSkyfile.skycell_id +ARGS ARG7 camera=GPC1 +ARGS ARG7 basename=$diffSkyfile.path_base + +OP OP1 ( $fault == 2 ? "diff.revert.on and diff.revert.off" : "difftool -revertdiffskyfile -fault $diffSkyfile.fault -label $diffRun.label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD diffSkyfile.diff_id, 5, %d, Diff ID +FIELD diffSkyfile.skycell_id, 5, %s, Skycell ID +FIELD diffRun.label, 5, %s, Label +FIELD diffRun.data_group, 5, %s, data grp +FIELD diffRun.dist_group, 5, %s, dist grp +# FIELD diffRun.filter, 5, %s, Filter +FIELD diffRun.tess_id, 5, %s, Tess ID +FIELD diffRun.state, 7, %s, State, value, diffProcessedSkyfile.php, ARG7 +FIELD diffSkyfile.fault, 5, %d, Fault +FIELD *, 50, %s, Command (Experimental), op=OP1 + +FIELD diffSkyfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/def/failedFakeProcessedImfile.d =================================================================== --- trunk/ippMonitor/def/failedFakeProcessedImfile.d (revision 28969) +++ trunk/ippMonitor/def/failedFakeProcessedImfile.d (revision 28969) @@ -0,0 +1,40 @@ +TABLE fakeRun, fakeProcessedImfile, camRun, chipRun, rawExp +TITLE fake Processed Imfile +FILE failedFakeProcessedImfile.php +MENU ipp.science.dat + +# limit this table to non-OBJECT types of images +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE fakeProcessedImfile.fake_id = fakeRun.fake_id +WHERE fakeProcessedImfile.fault != 0 + +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id +ARGS ARG4 fakeRun.fake_id=$fakeRun.fake_id + +ARGS ARG5 fakeRun.fake_id=fakeRun.fake_id +ARGS ARG5 fakeProcessedImfile.class_id=$fakeProcessedImfile.class_id +ARGS ARG5 camera=$rawExp.camera +ARGS ARG5 basename=$fakeProcessedImfile.path_base +ARGS ARG5 class=$fakeProcessedImfile.class_id + +OP OP1 ( $fakeProcessedImfile.fault == 2 ? "fake.revert.on and fake.revert.off" : "faketool -revertprocessedimfile -fault $fakeProcessedImfile.fault -label $fakeRun.label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD rawExp.exp_name, 10, %s, Exp Name +FIELD fakeProcessedImfile.class_id, 8, %s, Class ID +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile_failure.php, ARG4 +FIELD fakeRun.state, 7, %s, State, value, fakeProcessedImfile_failure.php, ARG5 +FIELD fakeRun.label, 7, %s, Label +FIELD fakeProcessedImfile.fault, 2, %d, Fault +FIELD *, 50, %s, Command (Experimental/Not tested), op=OP1 + +FIELD fakeProcessedImfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.IMFILE'); Index: trunk/ippMonitor/def/failedMagicMasks.d =================================================================== --- trunk/ippMonitor/def/failedMagicMasks.d (revision 28969) +++ trunk/ippMonitor/def/failedMagicMasks.d (revision 28969) @@ -0,0 +1,21 @@ +TABLE magicRun, magicMask +TITLE Magic Failed Masks +FILE failedMagicMasks.php +MENU ipp.stack.dat + +WHERE magicRun.magic_id = magicMask.magic_id +WHERE magicMask.fault != 0 + +OP OP1 ( $fault == 2 ? "magic.revert.on and magic.revert.off" : "magictool -revertmask -fault $magicMask.fault -label $label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD magicRun.magic_id, 5, %d, Magic ID +FIELD magicRun.exp_id, 5, %d, Exp ID +FIELD magicRun.diff_id, 5, %d, Diff ID +FIELD magicRun.label, 5, %s, Label +FIELD magicRun.data_group, 5, %s, data grp +FIELD magicRun.inverse, 5, %d, Inverse +FIELD magicRun.state, 5, %s, State +FIELD magicMask.streaks, 5, %d, Streaks +FIELD magicMask.fault, 5, %d, Fault +FIELD *, 50, %s, Command (Experimental), op=OP1 Index: trunk/ippMonitor/def/failedMagicNodes.d =================================================================== --- trunk/ippMonitor/def/failedMagicNodes.d (revision 28969) +++ trunk/ippMonitor/def/failedMagicNodes.d (revision 28969) @@ -0,0 +1,24 @@ +TABLE magicRun, magicTree, magicNodeResult +TITLE Magic Failed Nodes +FILE failedMagicNodes.php +MENU ipp.stack.dat + +WHERE magicRun.magic_id = magicTree.magic_id +WHERE magicTree.magic_id = magicNodeResult.magic_id +WHERE magicTree.node = magicNodeResult.node +WHERE magicNodeResult.fault != 0 + +OP OP1 ( $magicNodeResult.fault == 2 ? "magic.revert.on and magic.revert.off" : "magictool -revertnode -fault $magicNodeResult.fault -label $magicRun.label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD magicRun.magic_id, 5, %d, Magic ID +FIELD magicRun.exp_id, 5, %d, Exp ID +FIELD magicRun.diff_id, 5, %d, Diff ID +FIELD magicRun.label, 5, %s, Label +FIELD magicRun.data_group, 5, %s, data grp +FIELD magicRun.inverse, 5, %d, Inverse +FIELD magicRun.state, 5, %s, State +FIELD magicTree.node, 5, %s, Node +FIELD magicTree.dep, 5, %s, Parent +FIELD magicNodeResult.fault, 5, %d, Fault +FIELD *, 50, %s, Command (Experimental), op=OP1 Index: trunk/ippMonitor/def/failedMagicTrees.d =================================================================== --- trunk/ippMonitor/def/failedMagicTrees.d (revision 28969) +++ trunk/ippMonitor/def/failedMagicTrees.d (revision 28969) @@ -0,0 +1,19 @@ +TABLE magicRun +TITLE magic Failed Trees +FILE failedMagicTrees.php +MENU ipp.stack.dat + +WHERE fault != 0 + +OP OP1 ( $fault == 2 ? "magic.revert.on and magic.revert.off" : "magictool -reverttree -fault $fault -label $label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD magic_id, 5, %d, Magic ID +FIELD exp_id, 5, %d, Exp ID +FIELD diff_id, 5, %d, Diff ID +FIELD label, 5, %s, Label +FIELD data_group, 5, %s, Data Grp +FIELD inverse, 5, %d, Inverse +FIELD state, 5, %s, State +FIELD fault, 5, %d, Fault +FIELD *, 50, %s, Command (Experimental), op=OP1 Index: trunk/ippMonitor/def/failedStackSkyfile.d =================================================================== --- trunk/ippMonitor/def/failedStackSkyfile.d (revision 28969) +++ trunk/ippMonitor/def/failedStackSkyfile.d (revision 28969) @@ -0,0 +1,31 @@ +TABLE stackRun, stackSumSkyfile +TITLE Stack Failed Skyfiles +FILE failedStackSkyfile.php +MENU ipp.stack.dat + +WHERE stackRun.stack_id = stackSumSkyfile.stack_id +WHERE stackSumSkyfile.fault != 0 + +ARGS ARG7 stackRun.stack_id=$stackRun.stack_id +ARGS ARG7 stackRun.skycell_id=$stackRun.skycell_id +ARGS ARG7 camera=GPC1 +ARGS ARG7 basename=$stackSumSkyfile.path_base + +OP OP1 ( $stackSumSkyfile.fault == 2 ? "stack.revert.on and stack.revert.off" : "stacktool -revertsumskyfile -fault $stackSumSkyfile.fault -label $stackRun.label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD stackRun.stack_id, 5, %s, Stack ID +FIELD stackRun.skycell_id, 5, %s, Skycell ID +FIELD stackRun.label, 5, %s, Label +FIELD stackRun.data_group, 5, %s, data grp +FIELD stackRun.dist_group, 5, %s, dist grp +FIELD stackRun.filter, 5, %s, Filter +FIELD stackRun.tess_id, 5, %s, Tess ID +FIELD stackRun.state, 7, %s, State, value, stackFailedSkyfile.php, ARG7 +FIELD stackSumSkyfile.fault, 2, %d, Fault + +FIELD *, 50, %s, Command you should try to run as the ipp user? (Experimental feature), op=OP1 + +FIELD stackSumSkyfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/def/failedWarpSkyfiles.d =================================================================== --- trunk/ippMonitor/def/failedWarpSkyfiles.d (revision 28969) +++ trunk/ippMonitor/def/failedWarpSkyfiles.d (revision 28969) @@ -0,0 +1,42 @@ +TABLE warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp +TITLE Warp Failed Skyfiles +FILE failedWarpSkyfiles.php +MENU ipp.science.dat + +WHERE warpSkyfile.warp_id = warpRun.warp_id +WHERE warpRun.fake_id = fakeRun.fake_id +WHERE fakeRun.cam_id = camRun.cam_id +WHERE camRun.chip_id = chipRun.chip_id +WHERE chipRun.exp_id = rawExp.exp_id +WHERE warpSkyfile.fault != 0 + +ARGS ARG1 rawImfile.exp_id=$rawExp.exp_id +ARGS ARG2 chipRun.chip_id=$chipRun.chip_id +ARGS ARG3 camRun.cam_id=$camRun.cam_id +ARGS ARG4 fakeRun.fake_id=$fakeRun.fake_id +ARGS ARG5 warpRun.warp_id=$warpRun.warp_id +ARGS ARG6 warpSkyfile.skycell_id=$warpSkyfile.skycell_id + +ARGS ARG7 warpRun.warp_id=$warpRun.warp_id +ARGS ARG7 warpSkyfile.skycell_id=$warpSkyfile.skycell_id +ARGS ARG7 camera=$rawExp.camera +ARGS ARG7 basename=$warpSkyfile.path_base + +OP OP1 ( $warpSkyfile.fault == 2 ? "warp.revert.on and warp.revert.off" : "warptool -revertwarped -fault $warpSkyfile.fault -label $warpRun.label -dbname ". $ID['proj'] ) + +# field size format name show link to extras +FIELD rawExp.exp_name, 5, %s, Exp Name +FIELD rawExp.exp_id, 5, %d, Exp ID, value, rawImfile.php, ARG1 +FIELD chipRun.chip_id, 7, %d, Chip ID, value, chipProcessedImfile.php, ARG2 +FIELD camRun.cam_id, 7, %d, Cam ID, value, camProcessedExp.php, ARG3 +FIELD fakeRun.fake_id, 7, %d, Fake ID, value, fakeProcessedImfile.php, ARG4 +FIELD warpRun.warp_id, 7, %d, Warp ID, value, warpStageExp.php, ARG5 +FIELD warpSkyfile.skycell_id, 10, %s, Skycell ID, value, warpFailedSkyfiles.php, ARG6 +FIELD warpRun.state, 7, %s, State, value, warpFailedSkyfiles.php, ARG7 +FIELD warpRun.label, 7, %s, Label +FIELD warpSkyfile.fault, 2, %d, Fault +FIELD *, 50, %s, Command (Experimental), op=OP1 + +FIELD warpSkyfile.path_base, 5, %s, path_base, none + +TAIL PHP insert_log ('LOG.EXP'); Index: trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- trunk/ippMonitor/raw/czartool_labels.php (revision 28964) +++ trunk/ippMonitor/raw/czartool_labels.php (revision 28969) @@ -10,4 +10,6 @@ //$db = dbconnect($ID['proj']); $czardb = dbconnect("czardb"); // HACK to connect to czarDb +$lastUpdateTime = getLastUpdateTime($czardb); + $gpc1db = dbconnect($ID['proj']); @@ -22,5 +24,5 @@ else {$myMenu = "ipp.imfiles.dat";} -menu($myMenu, 'Czartool', 'ipp.css', $ID['link'], $ID['proj']); +menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']); $pass = $ID['pass']; @@ -34,6 +36,8 @@ $selectedRevertMode = $_GET[revertmode]; -if ($selectedLabel == "") $selectedLabel = "all_stdscience_labels"; -if ($selectedStage == "") $selectedStage = "all_stages"; +if ($selectedLabel == "") { $selectedLabel = "all_stdscience_labels"; } +if ($selectedStage == "") { $selectedStage = "all_stages"; } + +echo 'Some documentation can be found here
'; // deal with reverts: turn on or off if requested and pass current revert state for this stage onto labels table later @@ -83,5 +87,4 @@ echo "\n"; echo "\n"; -$lastUpdateTime = getLastUpdateTime($czardb); echo "

Current status of IPP (any faults are shown in parentheses). NOTE: This data is good as of: $lastUpdateTime

"; @@ -291,25 +294,25 @@ $anyFaults = false; - $link = "chipProcessedImfile_failure.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=new"; + $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=new"; getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults); write_table_cell($class, '%s', $anyFaults ? $link : "", $str); - $link = "camProcessedExp_failure.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=new"; + $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=new"; getStateAndFaults($db, $thisLabel, $selectedState, "cam", $str, $anyFaults); write_table_cell($class, '%s', $anyFaults ? $link : "", $str); - $link = $defaultlink; + $link = "failedFakeProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&fakeRun.label=" . $thisLabel . "&fakeRun.state=new"; getStateAndFaults($db, $thisLabel, $selectedState, "fake", $str, $anyFaults); write_table_cell($class, '%s', $anyFaults ? $link : "", $str); - $link = "warpFailedSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=new"; + $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=new"; getStateAndFaults($db, $thisLabel, $selectedState, "warp", $str, $anyFaults); write_table_cell($class, '%s', $anyFaults ? $link : "", $str); - $link = "stackFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $thisLabel . "&stackRun.state=new"; + $link = "failedStackSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $thisLabel . "&stackRun.state=new"; getStateAndFaults($db, $thisLabel, $selectedState, "stack", $str, $anyFaults); write_table_cell($class, '%s', $anyFaults ? $link : "", $str); - $link = "diffFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=new"; + $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=new"; getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults); write_table_cell($class, '%s', $anyFaults ? $link : "", $str); Index: trunk/ippMonitor/raw/ipp.imfiles.dat =================================================================== --- trunk/ippMonitor/raw/ipp.imfiles.dat (revision 28964) +++ trunk/ippMonitor/raw/ipp.imfiles.dat (revision 28969) @@ -25,4 +25,15 @@ menutop | menutop | plain |   | +menutop | menutop | link | New failed chip | failedChipProcessedImfile.php +menutop | menutop | link | New failed cam | failedCamProcessedExp.php +menutop | menutop | link | New failed fake | failedFakeProcessedImfile.php +menutop | menutop | link | New failed warp | failedWarpSkyfiles.php +menutop | menutop | link | New failed stack | failedStackSkyfile.php +menutop | menutop | link | New failed diff | failedDiffSkyfile.php +menutop | menutop | link | New failed magic tree | failedMagicTrees.php +menutop | menutop | link | New failed magic node | failedMagicNodes.php +menutop | menutop | link | New failed magic mask | failedMagicMasks.php + +menutop | menutop | plain |   | menulink | menuselect | link | Tables columns | columns_in_db.php menulink | menuselect | link | Clean /tmp directory | cleanTmpDirectory.php Index: trunk/ippMonitor/scripts/generate =================================================================== --- trunk/ippMonitor/scripts/generate (revision 28964) +++ trunk/ippMonitor/scripts/generate (revision 28969) @@ -648,5 +648,5 @@ foreach $word (@words) { $fword = &parse_fieldname ($word); - # print "field: $word -> $fword\n"; +# print "field: $word -> $fword\n"; push @outwords, $fword; if ($word =~ m|^\$|) { @@ -660,6 +660,6 @@ $opf{$name} = $outline; - # print "ops: $name : $ops{$name}\n"; - # print "opf: $name : $opf{$name}\n"; +# print "ops: $name : $ops{$name}\n"; +# print "opf: $name : $opf{$name}\n"; return 1;