Optimize the get_datarate() function, using some SQL and some C instead.

[nms] / web / nettkart.pl

diff --git a/web/nettkart.pl b/web/nettkart.pl
index cab7a3b8675100c11d08dfa912037f4ca992aa88..bff972bbd4b9a08f3f5ac96ffbcc956df1c8d4c6 100755 (executable)
--- a/web/nettkart.pl
+++ b/web/nettkart.pl
@@ -31,7 +31,7 @@ if ($night) {
        my $blank = $text_img->colorAllocateAlpha(0, 0, 0, 127);
        $text_img->filledRectangle(0, 0, $text_img->width - 1, $text_img->height - 1, $blank);
 } else {
-       $img = GD::Image->new('snmp-bg.png');
+       $img = GD::Image->new('bg07.png');
        $text_img = $img;
 }
 
@@ -53,11 +53,9 @@ $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, 620, "NMS (C) 2005-2006 Tech:Server");
+$text_img->stringFT($tclr, "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", 10, 0, 1000, 620, "NMS (C) 2005-2007 Tech:Server");
 
-my $q = $dbh->prepare('select * from switches natural join placements natural left join
-( select switch,sum(bytes_in) as bytes_in,sum(bytes_out) as bytes_out from get_datarate() group
-by switch ) t1 order by zorder');
+my $q = $dbh->prepare('select * from switches natural join placements natural left join current_datarate order by zorder');
 $q->execute();
 while (my $ref = $q->fetchrow_hashref()) {