Optomalize!

[nms] / web / nettkart-telnet.pl
diff --git a/web/nettkart-telnet.pl b/web/nettkart-telnet.pl

index fd320445d45c29c5c43d770b6fa22bdcc7139d58..2a21bad5c397028be24e297696b29616595bb066 100755 (executable)
--- a/web/nettkart-telnet.pl
+++ b/web/nettkart-telnet.pl
@@ -1,11 +1,12 @@
  #! /usr/bin/perl
  use CGI;
  use DBI;
+use lib '../include';
+use nms;
  my $cgi = CGI->new;
  
-my $dbh = DBI->connect("dbi:Pg:dbname=snmpfetch;host=violet.tg05.gathering.org", "snmpfetch", "removed")
-        or die "Couldn't connect to database";
-print $cgi->header(-type=>'text/html', -refresh=>'45; http://nms.tg05.gathering.org/nettkart-telnet.pl');
+my $dbh = nms::db_connect();
+print $cgi->header(-type=>'text/html; charset=utf-8', -refresh=>'45; http://nms.tg07.gathering.org/nettkart-telnet.pl');
  
  print <<"EOF";
  <html>
@@ -16,10 +17,7 @@ print <<"EOF";
      <map name="switches">
  EOF
  
-my $q = $dbh->prepare('select * from switches natural join placements natural left join
-( select switch,sum(bytes_in)/count(*) as
-bytes_in,sum(bytes_out)/count(*) as bytes_out from get_datarate() group
-by switch ) t1');
+my $q = $dbh->prepare('select * from switches natural join placements');
  $q->execute();
  while (my $ref = $q->fetchrow_hashref()) {
         $ref->{'placement'} =~ /\((\d+),(\d+)\),\((\d+),(\d+)\)/;