Changeset 523 for trunk/cgi-bin/main.cgi

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.

File:

• trunk/cgi-bin/main.cgi (modified) (2 diffs)

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