Index: /trunk/cgi-bin/IPDB.pm
===================================================================
--- /trunk/cgi-bin/IPDB.pm	(revision 661)
+++ /trunk/cgi-bin/IPDB.pm	(revision 662)
@@ -550,71 +550,4 @@
 
 
-## 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 = '<NONE>' if !$bigfree;
-    $$_{lfree} = $bigfree;
-  }
-  return $rlist;
-} # end listMaster()
-
-
-## IPDB::listRBlock()
-# 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 listRBlock {
-  my $dbh = shift;
-  my $routed = shift;
-
-  # Snag the allocations for this block
-  my $sth = $dbh->prepare("SELECT cidr,city,type,custid,swip,description".
-        " FROM allocations WHERE cidr <<= ? ORDER BY cidr");
-  $sth->execute($routed);
-
-  # hack hack hack
-  # set up to flag swip=y records if they don't actually have supporting data in the customers table
-  my $custsth = $dbh->prepare("SELECT count(*) FROM customers WHERE custid = ?");
-
-  my @blocklist;
-  while (my ($cidr,$city,$type,$custid,$swip,$desc) = $sth->fetchrow_array()) {
-    $custsth->execute($custid);
-    my ($ncust) = $custsth->fetchrow_array();
-    my %row = (
-	block => $cidr,
-	city => $city,
-	type => $disp_alloctypes{$type},
-	custid => $custid,
-	swip => ($swip eq 'y' ? 'Yes' : 'No'),
-	partswip => ($swip eq 'y' && $ncust == 0 ? 1 : 0),
-	desc => $desc
-	);
-    $row{subblock} = ($type =~ /^.r$/);         # hmf.  wonder why these won't work in the hash declaration...
-    $row{listpool} = ($type =~ /^.[pd]$/);
-    push (@blocklist, \%row);
-  }
-  return \@blocklist;
-} # end listRBlock()
-
-
 ## IPDB::listFree()
 # Gets a list of free blocks in the requested parent/master and VRF instance in both CIDR and range notation