Changeset 849 for trunk

Timestamp:

04/13/16 18:03:15 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine type argument handling in getBlockData() and deleteBlock() so
callers can just pass the allocation type instead of monkeying around
building a flag argument. Mainly useful for RPC but will likely trickle
out to internal calls.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -2903 +2903 @@
 
   # reset $basetype so caller can just pass the complete allocation type
-  if ($basetype =~ /.i/) {
+  if ($basetype =~ /^.?i$/) {
     $basetype = 'i';
   } else {
@@ -3222 +3222 @@
   my $type = shift || 'b';      # default to netblock for lazy callers
 
+  # reset $type so caller can just pass the complete allocation type
+  if ($type =~ /^.?i$/) {
+    $type = 'i';
+  } else {
+    $type = 'b';
+  }
+
 # catch some errors, someday
 #  if (!$id || $id !~ /^\d+$/) {
 #    $errstr = "Allocation ID must be numeric
 #  }
-
-  # netblocks are in the allocations table;  pool IPs are in the poolips table.
-  # If we try to look up a CIDR in an integer field we should just get back nothing.
-  my ($btype) = $dbh->selectrow_array("SELECT type FROM allocations WHERE id=?", undef, ($id) );
 
   # Note city, vrf, parent_id and master_id removed due to JOIN uncertainty for block allocations