improved processor text description rewriting (now in function)

git-svn-id: http://www.observium.org/svn/observer/trunk@1315 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2010-07-08 23:21:30 +00:00
parent d8d42a55b5
commit 8da13537f1
3 changed files with 17 additions and 9 deletions

View File

@ -1,5 +1,19 @@
<?php
function rewrite_processor_descr ($descr) {
$descr = str_replace("Distributed Forwarding Card", "DFC", $descr);
$descr = preg_replace("/7600 Series SPA Interface Processor-/", "SIP-", $descr);
$descr = preg_replace("/Rev\.\ [0-9\.]+\ /", "", $descr);
$descr = str_replace("Routing Processor", "RP", $descr);
$descr = str_replace("Switching Processor", "SP", $descr);
$descr = str_replace("Sub-Module", "Module ", $descr);
$descr = str_replace("DFC Card", "DFC", $descr);
return $descr;
}
function generateiflink($interface, $text=0, $type = NULL)
{

View File

@ -11,10 +11,8 @@
$mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=processor&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
$text_descr = $proc['processor_descr'];
$text_descr = str_replace("Routing Processor", "RP", $text_descr);
$text_descr = str_replace("Switching Processor", "SP", $text_descr);
$text_descr = str_replace("Sub-Module", "Module ", $text_descr);
$text_descr = str_replace("DFC Card", "DFC", $text_descr);
$text_descr = rewrite_processor_descr($text_descr);
$proc_popup = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
$proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=125\'>";

View File

@ -20,11 +20,7 @@ if(mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id = '
## REPLACE THIS SHITTY CODE. IT IS ALSO ELSEWHERE.
$text_descr = $proc['processor_descr'];
$text_descr = str_replace("Routing Processor", "RP", $text_descr);
$text_descr = str_replace("Switching Processor", "SP", $text_descr);
$text_descr = str_replace("Sub-Module", "Module ", $text_descr);
$text_descr = str_replace("DFC Card", "DFC", $text_descr);
$text_descr = rewrite_processor_descr($proc['processor_descr']);
# disable short hrDeviceDescr. need to make this prettier.
#$text_descr = short_hrDeviceDescr($proc['processor_descr']);