# | Line 19 | Line 19 | function printLine($title) { | |
---|---|---|
19 | ||
20 | ||
21 | function showStat($title, $value, $input) { | |
22 | < | preg_match("/$value=([^\,]*)[\,\}]/", $input, $matches); |
23 | < | $value = $matches[1]; |
22 | > | |
23 | > | $report = $value; |
24 | > | |
25 | > | $value = getPregMatch($value, $input); |
26 | if (empty($value)) { | |
27 | $value = "<i><font color=\"#999999\">not sent</font></i>"; | |
28 | } | |
29 | ?> | |
30 | <table border="0" width="100%"> | |
31 | <tr> | |
32 | < | <td width="50%" align="right" valign="top"><b><?=$title?></b></td> |
33 | < | <td width="50%" align="left" valign="top"><?=$value?></td> |
32 | > | <td width="50%" align="right" valign="top"> |
33 | > | <b><?=$title?></b> |
34 | > | </td> |
35 | > | <td width="50%" align="left" valign="top"> |
36 | > | <? if (preg_match("/^[0-9]+\.?[0-9]*$/", $value)) { |
37 | > | linkToHistory($report); |
38 | > | } ?> |
39 | > | <?=$value?></td> |
40 | </tr> | |
41 | </table> | |
42 | <? | |
# | Line 39 | Line 47 | function linkToHistory($report) { | |
47 | global $machine; | |
48 | $yesterday = date("Y-m-d", time() - 86400); | |
49 | echo <<<EOT | |
50 | < | <a href="browser.php?machine_name=$machine&report=$report&day=$yesterday&submit=Show"> |
43 | < | <img src="minichart.gif" width="20" height="20" border="0"> |
44 | < | </a> |
45 | < | <font size="2">View yesterday's 24-hour chart</font> |
50 | > | <a href="browser.php?machine_name=$machine&report=$report&day=$yesterday&submit=Show"><img src="minichart.gif" alt="View yesterday's 24-hour chart" width="20" height="20" border="0"></a> |
51 | EOT; | |
52 | } | |
53 | ||
54 | ||
55 | + | # show all disk information. |
56 | + | function showDisks($diskRoot, $units, $input) { |
57 | + | include("latest_config.inc.php"); |
58 | + | |
59 | + | $i = 0; |
60 | + | while(1) { |
61 | + | $name = getPregMatch("$diskRoot.p$i.attributes.name", $input); |
62 | + | if ($name) { |
63 | + | $mount = getPregMatch("$diskRoot.p$i.attributes.mount", $input); |
64 | + | $used = getPregMatch("$diskRoot.p$i.attributes.used", $input); |
65 | + | $kbytes = getPregMatch("$diskRoot.p$i.attributes.kbytes", $input); |
66 | + | showBar("$name ($mount)", $used, $kbytes, $units, $input); |
67 | + | } |
68 | + | $i++; |
69 | + | } |
70 | + | } |
71 | + | |
72 | + | # Return a preg_match result. |
73 | + | function getPregMatch($value, $input) { |
74 | + | preg_match("/$value=([^\,\}]*)[\,\}]/", $input, $matches); |
75 | + | return $matches[1]; |
76 | + | } |
77 | + | |
78 | + | |
79 | # show a bar-represented value. | |
80 | < | function showBar($title, $value, $max, $units, $input) { |
80 | > | function showBar($title, $value, $max, $units, $input, $arrange='normal') { |
81 | ||
82 | include("latest_config.inc.php"); | |
83 | ||
84 | $report = $value; | |
85 | ||
86 | < | preg_match("/$value=([^\,]*)\,/", $input, $matches); |
58 | < | $value = $matches[1]; |
86 | > | $value = getPregMatch($value, $input); |
87 | if (!is_int($max)) { | |
88 | < | preg_match("/$max=([^\,]*)\,/", $input, $matches); |
61 | < | $max = $matches[1]; |
88 | > | $max = getPregMatch($max, $input); |
89 | } | |
90 | if (empty($value) || empty($max)) { | |
91 | return; | |
92 | } | |
93 | ||
94 | + | if ($arrange == 'swap') { |
95 | + | $value = $max - $value; |
96 | + | } |
97 | + | |
98 | $width = intval($max_width * $value / $max); | |
99 | ||
100 | ?> | |
101 | <table border="0" cellpadding="0" cellspacing="0" align="center"> | |
102 | <tr> | |
103 | < | <td colspan="2"><b><?=$title?></b> <font size="2">(<?=$value?><?=$units?>)</font></td> |
103 | > | <td colspan="2"><? linkToHistory($report); ?> <b><?=$title?></b> <font size="2">(<?=$value?><?=$units?>)</font></td> |
104 | </tr> | |
105 | <tr> | |
106 | <td colspan="2" bgcolor="#eeeeff"><img src="<?=$barImage?>" border="0" height="20" width="<?=$width?>"></td> | |
# | Line 82 | Line 113 | function showBar($title, $value, $max, $units, $input) | |
113 | <td align="right"><?=$max?><?=$units?></td> | |
114 | </tr> | |
115 | <tr> | |
85 | – | <td colspan="2" align="center"><? linkToHistory($report); ?></td> |
86 | – | </tr> |
87 | – | <tr> |
116 | <td colspan="2"> </td> | |
117 | </tr> | |
118 | </table> | |
# | Line 144 | Line 172 | echo <<<EOT | |
172 | </td> | |
173 | <td bgcolor="#ffffcc"> | |
174 | <font face="arial,sans-serif" size="2"> | |
175 | < | <b>Recipt date:</b> $last_modified |
175 | > | <b>Receipt date:</b> $last_modified |
176 | $warning | |
177 | </font> | |
178 | </td> | |
# | Line 153 | Line 181 | echo <<<EOT | |
181 | EOT; | |
182 | ||
183 | # Read the file. | |
184 | < | #$input = "packet.attributes.machine_name=raptor.ukc.ac.uk,packet.memory.free=10,packet.memory.total=100,"; |
185 | < | $input = file("$latestDirectory/$machine/$latestData"); |
186 | < | # All we need is the first line if there is more than one line. |
187 | < | $input = $input[0]; |
184 | > | if (file_exists("$latestDirectory/$machine/$latestData")) { |
185 | > | $input = file("$latestDirectory/$machine/$latestData"); |
186 | > | # All we need is the first line if there is more than one line. |
187 | > | $input = $input[0]; |
188 | > | } |
189 | ||
190 | if (empty($input)) { | |
191 | < | echo "<br><br>There was an error reading from the latest packet received. Please notify your i-scream server administrator."; |
191 | > | echo "<br><br>There are currently no latest details about <b>$machine</b>. Please notify your i-scream server administrator if you believe this to be incorrect."; |
192 | } | |
193 | else { | |
194 | # Display the data specified in the display include. |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |