Changeset 555 for trunk

Timestamp:

11/20/12 17:58:48 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Fix allocateBlock() update's "simple" case; don't delete things
before retriving details we need

File:

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

trunk/cgi-bin/IPDB.pm

@@ -732 +732 @@
         $msg = "Unable to allocate $args{cidr} as '$disp_alloctypes{$args{type}}'";
 
+        # Get old freeblocks parent/depth/routed for new entries... before we delete it.
+        my ($fparent) = $dbh->selectrow_array("SELECT parent FROM freeblocks WHERE cidr=? AND rdepth=?",
+                undef, ($args{alloc_from}, $args{rdepth}) );
+
         # Munge freeblocks
         if ($args{type} =~ /^(.)[mc]$/) {
@@ -742 +746 @@
           $dbh->do("DELETE FROM freeblocks WHERE cidr=? AND rdepth=?", undef, ($args{cidr}, $args{rdepth}));
         }
-
-        # get old freeblocks parent/depth/routed for new entries
-        my ($fparent) = $dbh->selectrow_array("SELECT parent,city,routed FROM freeblocks".
-                " WHERE cidr=? AND rdepth=?", undef, ($args{alloc_from}, $args{rdepth}));
 
         # Insert the allocations entry