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

Timestamp:

10/23/12 13:32:47 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL for showRBlock to IPDB.pm
Tweak listFree() since the segments in showMaster and showRBlock it
replaced weren't quite as identical as I thought
Convert template to use odd and squeeze a bit more HTML out of
main.cgi and IPDB.pm

See #34.

File:

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

trunk/cgi-bin/main.cgi

@@ -238 +238 @@
   $page->param(routedlist => $rlist);
 
-  my $flist = listFree($ip_dbh, $webvar{block}, 'n');
+  my $flist = listFree($ip_dbh, $webvar{block});
   $page->param(unrouted => $flist);
 } # showMaster
@@ -252 +252 @@
 sub showRBlock {
 
-  my $master = new NetAddr::IP $webvar{block};
-
-  $sth = $ip_dbh->prepare("select city from routed where cidr='$master'");
-  $sth->execute;
-  my ($rcity) = $sth->fetchrow_array;
-
-  $page->param(master => "$master");
+  $page->param(master => $webvar{block});
+  $page->param(delrouted => $IPDBacl{$authuser} =~ /d/);
+
+  my $rcity = getRoutedCity($ip_dbh, $webvar{block});
   $page->param(rcity => $rcity);
 
-  # Snag the allocations for this block
-  $sth = $ip_dbh->prepare("select cidr,city,type,custid,swip,description".
-        " from allocations where cidr <<= '$master' order by cidr");
-  $sth->execute();
-
-  # hack hack hack
-  # set up to flag swip=y records if they don't actually have supporting data in the customers table
-  my $custsth = $ip_dbh->prepare("select count(*) from customers where custid=?");
-
-  my $rowclass = 0;
-  my @blocklist;
-  while (my ($cidr,$city,$type,$custid,$swip,$desc) = $sth->fetchrow_array()) {
-    $custsth->execute($custid);
-    my ($ncust) = $custsth->fetchrow_array();
-
-    my %row = (
-        rowclass => $rowclass++ % 2,
-        block => $cidr,
-        city => $city,
-        type => $disp_alloctypes{$type},
-        custid => $custid,
-        swip => ($swip eq 'y' ? ($ncust == 0 ? 'Yes<small>*</small>' : 'Yes') : 'No'),
-        desc => $desc
-        );
-    $row{subblock} = ($type =~ /^.r$/);         # hmf.  wonder why these won't work in the hash declaration...
-    $row{listpool} = ($type =~ /^.[pd]$/);
-    push (@blocklist, \%row);
-  }
-  $page->param(blocklist => \@blocklist);
-
-  $page->param(delrouted => $IPDBacl{$authuser} =~ /d/);
-
-  # Snag the free blocks.  We don't really *need* to be pedantic about avoiding
-  # unrouted free blocks, but it's better to let the database do the work if we can.
-  $rowclass = 0;
-  my @unassigned;
-  $sth = $ip_dbh->prepare("select cidr,routed from freeblocks where cidr <<= '$master'".
-        " order by cidr");
-  $sth->execute();
-  while (my ($cidr_db,$routed) = $sth->fetchrow_array()) {
-    my $cidr = new NetAddr::IP $cidr_db;
-
-    my %row = (
-        rowclass => $rowclass++ % 2,
-        subblock => ($routed ne 'y' && $routed ne 'n'),
-        fblock => $cidr_db,
-        fbtype => $routed,
-        frange => $cidr->range,
-        );
-    push @unassigned, \%row;
-  }
-  $page->param(unassigned => \@unassigned);
-
+  my $blist = listRBlock($ip_dbh, $webvar{block});
+  $page->param(blocklist => $blist);
+
+  my $flist = listFree($ip_dbh, $webvar{block}, 'y');
+  $page->param(unassigned => $flist);
 } # showRBlock