# | 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 44 | Line 52 | 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 | + | $mount = getPregMatch("$diskRoot.p$i.attributes.mount", $input); |
63 | + | if ($name || $mount) { |
64 | + | $used = "$diskRoot.p$i.attributes.used"; |
65 | + | $kbytes = "$diskRoot.p$i.attributes.kbytes"; |
66 | + | showBar("$name ($mount)", $used, $kbytes, $units, $input); |
67 | + | echo "$name ($mount) - $used/$kbytes<br>"; |
68 | + | } |
69 | + | else { |
70 | + | break; |
71 | + | } |
72 | + | $i++; |
73 | + | } |
74 | + | echo "$i"; |
75 | + | } |
76 | + | |
77 | + | # Return a preg_match result. |
78 | + | function getPregMatch($value, $input) { |
79 | + | preg_match("/$value=([^\,\}]*)[\,\}]/", $input, $matches); |
80 | + | return $matches[1]; |
81 | + | } |
82 | + | |
83 | + | |
84 | # show a bar-represented value. | |
85 | < | function showBar($title, $value, $max, $units, $input) { |
85 | > | function showBar($title, $value, $max, $units, $input, $arrange='normal') { |
86 | ||
87 | include("latest_config.inc.php"); | |
88 | ||
89 | $report = $value; | |
90 | ||
91 | < | preg_match("/$value=([^\,]*)\,/", $input, $matches); |
55 | < | $value = $matches[1]; |
91 | > | $value = getPregMatch($value, $input); |
92 | if (!is_int($max)) { | |
93 | < | preg_match("/$max=([^\,]*)\,/", $input, $matches); |
58 | < | $max = $matches[1]; |
93 | > | $max = getPregMatch($max, $input); |
94 | } | |
95 | if (empty($value) || empty($max)) { | |
96 | return; | |
97 | } | |
98 | ||
99 | + | if ($arrange == 'swap') { |
100 | + | $value = $max - $value; |
101 | + | } |
102 | + | |
103 | $width = intval($max_width * $value / $max); | |
104 | ||
105 | ?> | |
# | Line 138 | Line 177 | echo <<<EOT | |
177 | </td> | |
178 | <td bgcolor="#ffffcc"> | |
179 | <font face="arial,sans-serif" size="2"> | |
180 | < | <b>Recipt date:</b> $last_modified |
180 | > | <b>Receipt date:</b> $last_modified |
181 | $warning | |
182 | </font> | |
183 | </td> | |
# | Line 147 | Line 186 | echo <<<EOT | |
186 | EOT; | |
187 | ||
188 | # Read the file. | |
189 | < | #$input = "packet.attributes.machine_name=raptor.ukc.ac.uk,packet.memory.free=10,packet.memory.total=100,"; |
190 | < | $input = file("$latestDirectory/$machine/$latestData"); |
191 | < | # All we need is the first line if there is more than one line. |
192 | < | $input = $input[0]; |
189 | > | if (file_exists("$latestDirectory/$machine/$latestData")) { |
190 | > | $input = file("$latestDirectory/$machine/$latestData"); |
191 | > | # All we need is the first line if there is more than one line. |
192 | > | $input = $input[0]; |
193 | > | } |
194 | ||
195 | if (empty($input)) { | |
196 | < | echo "<br><br>There was an error reading from the latest packet received. Please notify your i-scream server administrator."; |
196 | > | 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."; |
197 | } | |
198 | else { | |
199 | # Display the data specified in the display include. |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |