Changeset 524 for trunk/cgi-bin/IPDB.pm

Timestamp:

10/22/12 17:10:07 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL for showmaster to IPDB.pm. See #34.
Tweak template to use odd for row colors

File:

• trunk/cgi-bin/IPDB.pm (modified) (3 diffs)

trunk/cgi-bin/IPDB.pm

@@ -27 +27 @@
         &initIPDBGlobals &connectDB &finish &checkDBSanity
         &addMaster
-        &listSummary &listMaster &listRBlock
+        &listSummary &listMaster &listRBlock &listFree
         &allocateBlock &deleteBlock &getBlockData
         &getNodeList
@@ -39 +39 @@
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
                 &addMaster
-                &listSummary &listMaster &listRBlock
+                &listSummary &listMaster &listRBlock &listFree
                 &allocateBlock &deleteBlock &getBlockData
                 &getNodeList
@@ -345 +345 @@
 
 
-# &listMaster &listRBlock
+## IPDB::listMaster()
+# Get list of routed blocks in the requested master
+# Returns an arrayref to a list of hashrefs containing the routed block, POP/city the block is routed to,
+# allocated count, free count, and largest free block masklength
+sub listMaster {
+  my $dbh = shift;
+  my $master = shift;
+
+  my $rlist = $dbh->selectall_arrayref("SELECT cidr AS block,city FROM routed WHERE cidr <<= ? ORDER BY cidr",
+        { Slice => {} }, ($master) );
+
+  foreach (@{$rlist}) {
+    my ($acnt) = $dbh->selectrow_array("SELECT count(*) FROM allocations WHERE cidr <<= ?", undef, ($$_{block}));
+    $$_{nsubs} = $acnt;
+    my ($fcnt) = $dbh->selectrow_array("SELECT count(*) FROM freeblocks WHERE cidr <<= ?".
+        " AND (routed='y' OR routed='n')", undef, ($$_{block}));
+    $$_{nfree} = $fcnt;
+    my ($bigfree) = $dbh->selectrow_array("SELECT maskbits FROM freeblocks WHERE cidr <<= ?".
+        " AND (routed='y' OR routed='n') ORDER BY maskbits LIMIT 1", undef, ($$_{block}));
+##fixme:  should find a way to do this without having to HTMLize the <>
+    $bigfree = "/$bigfree" if $bigfree;
+    $bigfree = '&lt;NONE&gt;' if !$bigfree;
+    $$_{lfree} = $bigfree;
+  }
+  return $rlist;
+} # end listMaster()
+
+
+# &listRBlock
+
+
+## IPDB::listFree()
+# Gets a list of free blocks in the requested parent/master in both CIDR and range notation
+# Takes a parent/master and an optional flag to look at routed or unrouted blocks, depending
+# on whether the master is a direct master or a routed block
+# Returns an arrayref to a list of hashrefs containing the CIDR and range-notation blocks
+sub listFree {
+  my $dbh = shift;
+  my $master = shift;
+  my $routed = shift || 'y';
+
+  # do it this way so we can waste a little less time iterating
+  my $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE cidr <<= ? AND routed = ? ORDER BY cidr");
+  $sth->execute($master, $routed);
+  my @flist;
+  while (my ($cidr) = $sth->fetchrow_array()) {
+    $cidr = new NetAddr::IP $cidr;
+    my %row = (fblock => "$cidr", frange => $cidr->range);
+    push @flist, \%row;
+  }
+  return \@flist;
+}