Optomalize!

diff --git a/web/nettkart-telnet.pl b/web/nettkart-telnet.pl
index b3ea2dfa124c8e7e3e04ec9dbeb1b73b03e9fbc6..2a21bad5c397028be24e297696b29616595bb066 100755 (executable)
--- a/web/nettkart-telnet.pl
+++ b/web/nettkart-telnet.pl
@@ -17,10 +17,7 @@ print <<"EOF";
     <map name="switches">
 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+)\)/;
 $q->execute();
 while (my $ref = $q->fetchrow_hashref()) {
        $ref->{'placement'} =~ /\((\d+),(\d+)\),\((\d+),(\d+)\)/;

diff --git a/web/nettkart-text.pl b/web/nettkart-text.pl
index 9e2eb321acd7e5c5ef5e45590bb85e33137445b8..23e5cad1898c810930e21181da494f3c3792fcbd 100755 (executable)
--- a/web/nettkart-text.pl
+++ b/web/nettkart-text.pl
@@ -17,10 +17,7 @@ print <<"EOF";
     <map name="switches">
 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+)\)/;
 $q->execute();
 while (my $ref = $q->fetchrow_hashref()) {
        $ref->{'placement'} =~ /\((\d+),(\d+)\),\((\d+),(\d+)\)/;

diff --git a/web/nettkart-web.pl b/web/nettkart-web.pl
index a3d64ac8b97233a042af9c60885a97c79d24858e..8f37b1efd12b63b6af21aa73879934bbee47c4c3 100755 (executable)
--- a/web/nettkart-web.pl
+++ b/web/nettkart-web.pl
@@ -17,10 +17,7 @@ print <<"EOF";
     <map name="switches">
 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+)\)/;
 $q->execute();
 while (my $ref = $q->fetchrow_hashref()) {
        $ref->{'placement'} =~ /\((\d+),(\d+)\),\((\d+),(\d+)\)/;