Changeset 757 for trunk

Timestamp:

07/28/15 17:52:15 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine "rDNS-is-available?" flags and how they're generated in
getBlockData(). See #41.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -2943 +2943 @@
   if ($type eq 'i') {
     my $binfo = $dbh->selectrow_hashref(qq(
-        SELECT id, ip AS block, city, vrf, parent_id, master_id, $commonfields
-        FROM poolips WHERE id = ?
+        SELECT p.id, p.ip AS block, p.city, p.vrf, p.parent_id, p.master_id, $commonfields,
+                d.zone >> p.ip AS revavail
+        FROM poolips p
+        LEFT JOIN dnsavail d ON p.master_id = d.parent_alloc AND p.ip << d.zone
+        WHERE id = ?
         ), undef, ($id) );
     return $binfo;
   } else {
     my $binfo = $dbh->selectrow_hashref(qq(
-        SELECT a.id, a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, revzone, $commonfields,
+        SELECT a.id, a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, $commonfields,
                 f.cidr AS reserve, f.id as reserve_id,
                 d.zone >>= a.cidr AS revavail, d.zone << a.cidr AS revpartial
         FROM allocations a
         LEFT JOIN freeblocks f ON a.id=f.reserve_for
-        LEFT JOIN dnsavail d ON a.parent_id = d.parent_alloc AND (a.cidr <<= d.zone OR a.cidr >> d.zone)
+        LEFT JOIN dnsavail d ON a.master_id = d.parent_alloc AND (a.cidr <<= d.zone OR a.cidr >> d.zone)
         WHERE a.id = ?
         ), undef, ($id) );