Changeset 625

Timestamp:

10/08/14 16:25:51 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 1/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Update IPDB::listSummary() for new DB structure

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -424 +424 @@
   my $dbh = shift;
 
-  my $mlist = $dbh->selectall_arrayref("SELECT cidr AS master FROM masterblocks ORDER BY cidr", { Slice => {} });
+  my $mlist = $dbh->selectall_arrayref("SELECT cidr AS master,id,vrf FROM allocations ".
+        "WHERE type='mm' ORDER BY cidr",
+        { Slice => {} });
 
   foreach (@{$mlist}) {
-    my ($rcnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ? AND type='rm'",
-        undef, ($$_{master}));
+    my ($rcnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ? AND type='rm' AND master_id = ?",
+        undef, ($$_{master}, $$_{id}));
     $$_{routed} = $rcnt;
-    my ($acnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ? AND NOT type='rm'",
-        undef, ($$_{master}));
+    my ($acnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ? ".
+        "AND NOT type='rm' AND NOT type='mm' AND master_id = ?",
+        undef, ($$_{master}, $$_{id}));
     $$_{allocated} = $acnt;
-    my ($fcnt) = $dbh->selectrow_array("SELECT count(*) FROM freeblocks WHERE cidr <<= ?",
-        undef, ($$_{master}));
+    my ($fcnt) = $dbh->selectrow_array("SELECT count(*) FROM freeblocks WHERE cidr <<= ? AND master_id = ?",
+        undef, ($$_{master}, $$_{id}));
     $$_{free} = $fcnt;
     my ($bigfree) = $dbh->selectrow_array("SELECT masklen(cidr) AS maskbits FROM freeblocks WHERE cidr <<= ?".
-        " AND parent = ? ORDER BY masklen(cidr) LIMIT 1", undef, ($$_{master}, $$_{master}));
+        " AND master_id = ? ORDER BY masklen(cidr) LIMIT 1", undef, ($$_{master}, $$_{id}));
 ##fixme:  should find a way to do this without having to HTMLize the <>
     $bigfree = "/$bigfree" if $bigfree;