Changeset 29260 for trunk/ippMonitor/raw/czartool_labels.php
- Timestamp:
- Sep 29, 2010, 11:09:11 AM (16 years ago)
- File:
-
- 1 edited
-
trunk/ippMonitor/raw/czartool_labels.php (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippMonitor/raw/czartool_labels.php
r29072 r29260 35 35 $selectedRevertStage = $_GET[revertstage]; 36 36 $selectedRevertMode = $_GET[revertmode]; 37 $plotType = $_GET[plottype]; 37 38 38 39 if ($selectedLabel == "") { $selectedLabel = "all_stdscience_labels"; } 39 40 if ($selectedStage == "") { $selectedStage = "all_stages"; } 41 if ($plotType == "") { $plotType = "linear"; } 40 42 41 43 $nsStatus = getNightlyScienceStatus($czardb); 42 echo "<p align=\"center\"> Current status of the IPP as of $lastUpdateTime (faults are shown in parentheses). <br>Documentation can be found <a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\">here</a> and cluster load monitored <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&c=IPP%2520Production\">here</a><br>Current nightly science status: $nsStatus</p>"; 44 $plotTypeLink = ($plotType == "linear") ? "log" : "linear"; 45 $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; 46 echo "<p align=\"center\"> Current status of the IPP as of $lastUpdateTime (faults are shown in parentheses). <br>Documentation can be found <a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\">here</a> and cluster load monitored <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&c=IPP%2520Production\">here</a><br>Current nightly science status: $nsStatus<br>Use <a href=\"$link\"> $plotTypeLink</a> plots </p>"; 43 47 44 48 … … 93 97 echo "<tr>\n"; 94 98 echo "<td>\n"; 95 echo "<img src=\"czartool_getplot.php?type=t&label=$selectedLabel&stage=$selectedStage \"><br>";99 echo "<img src=\"czartool_getplot.php?type=t&label=$selectedLabel&stage=$selectedStage&plottype=$plotType\"><br>"; 96 100 echo "</td>\n"; 97 101 98 102 echo "<td> \n"; 99 createLabelsTable($pass, $proj, $czardb, "stdscience", $stdsLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage );103 createLabelsTable($pass, $proj, $czardb, "stdscience", $stdsLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage, $plotType); 100 104 echo "</td>\n"; 101 105 echo "</tr>\n"; … … 103 107 echo "<tr>\n"; 104 108 echo "<td>\n"; 105 echo "<img src=\"czartool_getplot.php?type=h&label=$selectedLabel&stage=$selectedStage \"><br>";109 echo "<img src=\"czartool_getplot.php?type=h&label=$selectedLabel&stage=$selectedStage&plottype=linear\"><br>"; 106 110 echo "</td>\n"; 107 111 108 112 echo "<td> \n"; 109 createLabelsTable($pass, $proj, $czardb, "update", $updateLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage );113 createLabelsTable($pass, $proj, $czardb, "update", $updateLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage, $plotType); 110 114 echo "</td>\n"; 111 115 echo "</tr>\n"; … … 118 122 echo "</td>\n"; 119 123 echo "<td>\n"; 120 createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage );124 createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); 121 125 echo "</td>\n"; 122 126 … … 225 229 # 226 230 ########################################################################### 227 function createLabelsTable($pass, $proj, $db, $server, $labels, $distLabels, $pubLabels, $stages, $states, $selectedState, $selectedLabel, $selectedStage ) {231 function createLabelsTable($pass, $proj, $db, $server, $labels, $distLabels, $pubLabels, $stages, $states, $selectedState, $selectedLabel, $selectedStage, $plotType) { 228 232 229 233 // set up table columns … … 241 245 if ($stage == "burntool") continue; 242 246 $reverting = getRevertStatus($db, $stage); 243 $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage ."&revertmode=";247 $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType."&revertstage=".$stage."&revertmode="; 244 248 if(!$reverting) {$label = "Start";$link = $link . "on";} 245 249 if($reverting) {$label = "Stop";$link = $link . "off";} … … 256 260 257 261 if ($stage == $selectedStage) $link = ""; 258 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $stage;262 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=".$stage."&plottype=".$plotType; 259 263 write_table_cell($class, '%s', $link, $stage); 260 264 } 261 265 262 266 if ($selectedStage=="all_stages") $link = ""; 263 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=all_stages" ;267 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=all_stages"."&plottype=".$plotType; 264 268 write_table_cell($class, '%s', $link, "All stages"); 265 269 … … 267 271 echo "<tr><td></td>\n"; 268 272 269 $defaultlink = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj ;273 $defaultlink = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType; 270 274 271 275 // write rows … … 285 289 // create link to label summary page for each label 286 290 if ($thisLabel == $selectedLabel) $link = ""; 287 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $thisLabel . "&stage=" . $selectedStage ;291 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $thisLabel . "&stage=" . $selectedStage."&plottype=".$plotType; 288 292 289 293 echo "<tr><td></td>\n"; … … 342 346 343 347 if ($selectedLabel == "all_".$server."_labels") $link = ""; 344 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage ;348 else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; 345 349 346 350 echo "<tr><td></td>\n"; … … 437 441 # 438 442 ########################################################################### 439 function createServersTable($pass, $proj, $db, $servers, $selectedLabel, $selectedStage ) {443 function createServersTable($pass, $proj, $db, $servers, $selectedLabel, $selectedStage, $plotType) { 440 444 441 445 // set up table columns … … 450 454 foreach ($servers as &$server) { 451 455 452 $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&server=".$server."&label=".$selectedLabel."&stage=".$selectedStage ;456 $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&server=".$server."&label=".$selectedLabel."&stage=".$selectedStage."&plottype=".$plotType; 453 457 // $link = ""; 454 458
Note:
See TracChangeset
for help on using the changeset viewer.
