Changeset 560

Timestamp:

12/19/12 16:03:38 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Update listSummary() for new table logic and fields

File:

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

trunk/cgi-bin/IPDB.pm

@@ -341 +341 @@
 
   foreach (@{$mlist}) {
-    my ($rcnt) = $dbh->selectrow_array("SELECT count(*) FROM routed WHERE cidr <<= ?", undef, ($$_{master}));
+    my ($rcnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ? AND type='rm'",
+        undef, ($$_{master}));
     $$_{routed} = $rcnt;
-    my ($acnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ?", undef, ($$_{master}));
+    my ($acnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ? AND NOT type='rm'",
+        undef, ($$_{master}));
     $$_{allocated} = $acnt;
-    my ($fcnt) = $dbh->selectrow_array("SELECT count(*) FROM freeblocks WHERE cidr <<= ?".
-        " AND (routed='y' OR routed='n')", undef, ($$_{master}));
+    my ($fcnt) = $dbh->selectrow_array("SELECT count(*) FROM freeblocks WHERE cidr <<= ?",
+        undef, ($$_{master}));
     $$_{free} = $fcnt;
-    my ($bigfree) = $dbh->selectrow_array("SELECT maskbits FROM freeblocks WHERE cidr <<= ?".
-        " AND (routed='y' OR routed='n') ORDER BY maskbits LIMIT 1", undef, ($$_{master}));
+    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}));
 ##fixme:  should find a way to do this without having to HTMLize the <>
     $bigfree = "/$bigfree" if $bigfree;