Changeset 710 for trunk/DNSDB.pm

Timestamp:

03/17/16 15:06:32 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine/fix behaviour of updateRevSet() and chained subs

• properly represent add, update, and delete actions all in one set
• do nothing on null "updates" to keep log noise down
• properly target requests to a single location to avoid stomping unrelated records

File:

• trunk/DNSDB.pm (modified) (3 diffs)

trunk/DNSDB.pm

@@ -5183 +5183 @@
 ## DNSDB::getZonesByCIDR()
 # Get a list of zone names and IDs that records for a passed CIDR block are within.
+# Optionally restrict to a specific location/view
 sub getZonesByCIDR {
   my $self = shift;
@@ -5188 +5189 @@
   my %args = @_;
 
-  my $result = $dbh->selectall_arrayref("SELECT rdns_id,revnet FROM revzones WHERE revnet >>= ? OR revnet <<= ?",
-        { Slice => {} }, ($args{cidr}, $args{cidr}) );
+  my $sql = "SELECT rdns_id,revnet,default_location FROM revzones WHERE revnet >>= ? OR revnet <<= ?".
+        ($args{location} ? " AND default_location = ?" : '');
+  my @svals = ($args{cidr}, $args{cidr});
+  push @svals, $args{location} if $args{location};
+
+  my $result = $dbh->selectall_arrayref($sql, { Slice => {} }, @svals );
   return $result;
 } # end getZonesByCIDR()
@@ -5351 +5356 @@
 ##fixme:  serial
       $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef,
-        ($zone, $group, $args{status}) );
+        ($zone, $group, $args{status}) ) or die $dbh->errstr;
       # get domain id so we can do the records
       ($zone_id) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");