Changeset 653 for trunk

Timestamp:

12/17/14 18:04:01 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend listSubs() to include some details on container blocks when
appropriate. Not sure this format will work; it ends up looking very
busy and confused after importing a dataset from IPDB 2.8. Consider
splitting containers vs direct allocations (so that there would be
three main page sections, not two).

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (1 diff)
• templates/showsubs.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -500 +500 @@
   my $custsth = $dbh->prepare("SELECT count(*) FROM customers WHERE custid = ?");
 
+  # snag some more details
+  my $substh = $dbh->prepare("SELECT count(*) FROM allocations WHERE cidr <<= ? AND type='rm' AND master_id = ? AND NOT cidr = ? ");
+  my $alsth = $dbh->prepare("SELECT count(*) FROM allocations WHERE cidr <<= ? ".
+        "AND NOT type='rm' AND NOT type='mm' AND master_id = ?");
+  my $freesth = $dbh->prepare("SELECT count(*) FROM freeblocks WHERE cidr <<= ? AND master_id = ?");
+  my $lfreesth = $dbh->prepare("SELECT masklen(cidr) AS maskbits FROM freeblocks WHERE cidr <<= ?".
+        " AND master_id = ? ORDER BY masklen(cidr) LIMIT 1");
+
   my @blocklist;
-  while (my ($cidr,$city,$type,$custid,$swip,$desc,$id) = $sth->fetchrow_array()) {
+  while (my ($cidr,$city,$type,$custid,$swip,$desc,$id,$mid) = $sth->fetchrow_array()) {
     $custsth->execute($custid);
     my ($ncust) = $custsth->fetchrow_array();
+    $substh->execute($cidr, $mid, $cidr);
+    my ($cont) = $substh->fetchrow_array();
+    $alsth->execute($cidr, $mid);
+    my ($alloc) = $alsth->fetchrow_array();
+    $freesth->execute($cidr, $mid);
+    my ($free) = $freesth->fetchrow_array();
+    $lfreesth->execute($cidr, $mid);
+    my ($lfree) = $lfreesth->fetchrow_array();
+    $lfree = "/$lfree" if $lfree;
+    $lfree = '<NONE>' if !$lfree;
     my %row = (
         block => $cidr,
+        subcontainers => $cont,
+        suballocs => $alloc,
+        subfree => $free,
+        lfree => $lfree,
         city => $city,
         type => $disp_alloctypes{$type},

trunk/templates/showsubs.tmpl

@@ -31 +31 @@
 <td><TMPL_VAR NAME=desc></td>
 </tr>
+<TMPL_IF hassubs>
+<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
+<td colspan=4>
+Containers: <TMPL_VAR NAME=subcontainers>, Allocations: <TMPL_VAR NAME=suballocs>, Free: <TMPL_VAR NAME=subfree>, Largest free: <TMPL_VAR ESCAPE=HTML NAME=lfree>
+</td><td colspan=2></td></tr>
+</TMPL_IF>
 </TMPL_LOOP>
 </table>