Changeset 523 for trunk

Timestamp:

10/19/12 17:32:12 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Move SQL for index/summary page into IPDB.pm. See #34.
Tweak initialization of page templates to set loop_context_vars so
we don't have to manually maintain the row0/row1 entries
Commentstub subs for master and routed list pages.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (2 diffs)
• templates/index.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -25 +25 @@
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist @masterblocks
         %allocated %free %routed %bigfree %IPDBacl %aclmsg
-        &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &addMaster
-        &deleteBlock &getBlockData
+        &initIPDBGlobals &connectDB &finish &checkDBSanity
+        &addMaster
+        &listSummary &listMaster &listRBlock
+        &allocateBlock &deleteBlock &getBlockData
         &getNodeList
         &mailNotify
@@ -35 +37 @@
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
                 @masterblocks %allocated %free %routed %bigfree %IPDBacl %aclmsg
-                &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
-                &addMaster &deleteBlock &getBlockData
+                &initIPDBGlobals &connectDB &finish &checkDBSanity
+                &addMaster
+                &listSummary &listMaster &listRBlock
+                &allocateBlock &deleteBlock &getBlockData
                 &getNodeList
                 &mailNotify
@@ -311 +315 @@
   }
 } # end addMaster
+
+
+## IPDB::listSummary()
+# Get summary list of all master blocks
+# Returns an arrayref to a list of hashrefs containing the master block, routed count,
+# allocated count, free count, and largest free block masklength
+sub listSummary {
+  my $dbh = shift;
+
+  my $mlist = $dbh->selectall_arrayref("SELECT cidr AS master FROM masterblocks ORDER BY cidr", { Slice => {} });
+
+  foreach (@{$mlist}) {
+    my ($rcnt) = $dbh->selectrow_array("SELECT count(*) FROM routed WHERE cidr <<= ?", undef, ($$_{master}));
+    $$_{routed} = $rcnt;
+    my ($acnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ?", undef, ($$_{master}));
+    $$_{allocated} = $acnt;
+    my ($fcnt) = $dbh->selectrow_array("SELECT count(*) FROM freeblocks WHERE cidr <<= ?".
+        " AND (routed='y' OR routed='n')", 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}));
+##fixme:  should find a way to do this without having to HTMLize the <>
+    $bigfree = "/$bigfree" if $bigfree;
+    $bigfree = '&lt;NONE&gt;' if !$bigfree;
+    $$_{bigfree} = $bigfree;
+  }
+  return $mlist;
+} # end listSummary()
+
+
+# &listMaster &listRBlock
 
 

trunk/cgi-bin/main.cgi

@@ -90 +90 @@
 my $page;
 if (-e "$ENV{HTML_TEMPLATE_ROOT}/$webvar{action}.tmpl") {
-  $page = HTML::Template->new(filename => "$webvar{action}.tmpl");
+  $page = HTML::Template->new(filename => "$webvar{action}.tmpl", loop_context_vars => 1);
 } else {
   $page = HTML::Template->new(filename => "dunno.tmpl");
@@ -218 +218 @@
 # Initial display:  Show master blocks with total allocated subnets, total free subnets
 sub showSummary {
-  my %allocated;
-  my %free;
-  my %routed;
-  my %bigfree;
-
-  # Count the allocations.
-  $sth = $ip_dbh->prepare("select count(*) from allocations where cidr <<= ?");
-  foreach my $master (@masterblocks) {
-    $sth->execute("$master");
-    $sth->bind_columns(\$allocated{"$master"});
-    $sth->fetch();
-  }
-
-  # Count routed blocks
-  $sth = $ip_dbh->prepare("select count(*) from routed where cidr <<= ?");
-  foreach my $master (@masterblocks) {
-    $sth->execute("$master");
-    $sth->bind_columns(\$routed{"$master"});
-    $sth->fetch();
-  }
-
-  # Count the free blocks.
-  $sth = $ip_dbh->prepare("select count(*) from freeblocks where cidr <<= ? and ".
-        "(routed='y' or routed='n')");
-  foreach my $master (@masterblocks) {
-    $sth->execute("$master");
-    $sth->bind_columns(\$free{"$master"});
-    $sth->fetch();
-  }
-
-  # Find the largest free block in each master
-  $sth = $ip_dbh->prepare("select maskbits from freeblocks where cidr <<= ? and ".
-        "(routed='y' or routed='n') order by maskbits limit 1");
-  foreach my $master (@masterblocks) {
-    $sth->execute("$master");
-    $sth->bind_columns(\$bigfree{"$master"});
-    $sth->fetch();
-  }
-
-  # Assemble the data to stuff into the template.
-  my @masterlist;
-  my $rowclass=0;
-  foreach my $master (@masterblocks) {
-    my %row = (
-        rowclass => $rowclass++ % 2,
-        master => "$master",
-        routed => $routed{"$master"},
-        allocated => $allocated{"$master"},
-        free => $free{"$master"},
-        bigfree => ( ($bigfree{"$master"} eq '') ? ("&lt;NONE&gt;") : ("/".$bigfree{"$master"}) )
-        );
-    push (@masterlist, \%row);
-  }
-  $page->param(masterlist => \@masterlist);
+  my $masterlist = listSummary($ip_dbh);
+  $page->param(masterlist => $masterlist);
 
   $page->param(addmaster => ($IPDBacl{$authuser} =~ /a/) );
-
 } # showSummary
 

trunk/templates/index.tmpl

@@ -10 +10 @@
 </tr>
 <TMPL_LOOP NAME=masterlist>
-<tr class="row<TMPL_VAR name=rowclass>">
+<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
 <td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showmaster&amp;block=<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master></a></td>
 <td><TMPL_VAR NAME=routed></td>