diff options
author | Joachim Tingvold <joachim@tingvold.com> | 2015-04-01 03:50:30 +0200 |
---|---|---|
committer | root <root@einstein.tg15.gathering.org> | 2015-04-01 03:50:30 +0200 |
commit | d284e121df845de3118b720e374bf3bcfd1c9317 (patch) | |
tree | 773ae49e9b9dc1d4ea7ae44eb92a412bc5af4da1 /web/nms.gathering.org/nettkart.pl | |
parent | 41b1eca7a62d450bc0d2357027a6be6acd51a7a6 (diff) |
NMS-changes
Diffstat (limited to 'web/nms.gathering.org/nettkart.pl')
-rwxr-xr-x | web/nms.gathering.org/nettkart.pl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/web/nms.gathering.org/nettkart.pl b/web/nms.gathering.org/nettkart.pl index dd27cb9..3e999a9 100755 --- a/web/nms.gathering.org/nettkart.pl +++ b/web/nms.gathering.org/nettkart.pl @@ -56,7 +56,7 @@ $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*2.0/4.0, "1 Gbit/sec"); $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*3.0/4.0, "100 Mbit/sec"); $text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 40, 47 + (236-42)*4.0/4.0, "10 Mbit/sec"); -$text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 700, "NMS (C) 2005-2012 Tech:Server"); +$text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1600, 1000, "NMS (C) 2005-2012 Tech:Server"); my $q = $dbh->prepare("select * from ( SELECT switch,sysname,sum(bytes_in) AS bytes_in,sum(bytes_out) AS bytes_out from switches natural left join get_current_datarate() where ip <> inet '127.0.0.1' group by switch,sysname) t1 natural join placements order by zorder;"); $q->execute(); @@ -87,7 +87,6 @@ while (my $ref = $q->fetchrow_hashref()) { my $sysname = $ref->{'sysname'}; $sysname =~ s/-sekrit//; - $sysname =~ s/\..*$//; $ref->{'placement'} =~ /\((\d+),(\d+)\),\((\d+),(\d+)\)/; $img->filledRectangle($3,$4,$1,$2,$clr); |