Changeset 556

Timestamp:

12/18/12 17:57:27 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Update addMaster() to handle new table logic and fields

File:

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

trunk/cgi-bin/IPDB.pm

@@ -233 +233 @@
 # elsewhere though;  legacy data may have traps and pitfalls in it to break this.
 # Thus the "routed" flag.
-      $dbh->do("INSERT INTO freeblocks (cidr,maskbits,city,routed) VALUES (?,?,?,?)", undef,
-        ($cidr, $cidr->masklen, '<NULL>', 'n') );
+      $dbh->do("INSERT INTO freeblocks (cidr,maskbits,city,routed,parent,rdepth) VALUES (?,?,?,?,?,?)", undef,
+        ($cidr, $cidr->masklen, '<NULL>', 'm', $cidr, 1) );
 
       # If we get here, everything is happy.  Commit changes.
@@ -264 +264 @@
 
       # collect the unrouted free blocks within the new master
-      $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE maskbits <= ? AND cidr <<= ? AND routed = 'n'");
+      $sth = $dbh->prepare("SELECT cidr FROM freeblocks WHERE masklen(cidr) <= ? AND cidr <<= ? AND routed = 'm'");
       $sth->execute($smallmask, $cidr);
       while (my @data = $sth->fetchrow_array) {
@@ -278 +278 @@
       # freeblocks
       $sth = $dbh->prepare("DELETE FROM freeblocks WHERE cidr <<= ?");
-      my $sth2 = $dbh->prepare("INSERT INTO freeblocks (cidr,maskbits,city,routed) VALUES (?,?,'<NULL>','n')");
+      my $sth2 = $dbh->prepare("INSERT INTO freeblocks (cidr,maskbits,city,routed,parent,rdepth)".
+        " VALUES (?,?,'<NULL>','m',?,1)");
       foreach my $newblock (@blocklist) {
         $sth->execute($newblock);
-        $sth2->execute($newblock, $newblock->masklen);
-      }
+        $sth2->execute($newblock, $newblock->masklen, $cidr);
+      }
+
+      # update parent relations at rdepth=1
+      $dbh->do("UPDATE allocations SET parent = ? WHERE parent << ? AND rdepth=1", undef, ($cidr, $cidr) );
+      $dbh->do("UPDATE freeblocks SET parent = ? WHERE parent << ? AND rdepth=1", undef, ($cidr, $cidr) );
 
       # master