Changeset 715 for trunk

Timestamp:

04/13/16 10:31:32 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Fine-tuning behaviour to support IPDB RPC calls

• allow filtering record lists in getRecList on location as well
• add option to getZonesByCIDR to leave out default_location field in return

File:

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

trunk/DNSDB.pm

@@ -4200 +4200 @@
   my $perpage = ($args{nrecs} ? $args{nrecs} : $self->{perpage});
 
-
 ##fixme:  do we need a knob to twist to switch from unix epoch to postgres time string?
   my @bindvars;
@@ -4230 +4229 @@
 
   # Filtering on other fields
-  foreach (qw(type distance weight port ttl description)) {
+  foreach (qw(type distance weight port ttl description location)) {
     if ($args{$_}) {
       $sql .= " AND $_ ~* ?";
@@ -5184 +5183 @@
 # Get a list of zone names and IDs that records for a passed CIDR block are within.
 # Optionally restrict to a specific location/view
+# Optionally leave off the default_location field
 sub getZonesByCIDR {
   my $self = shift;
   my $dbh = $self->{dbh};
   my %args = @_;
-
-  my $sql = "SELECT rdns_id,revnet,default_location FROM revzones WHERE (revnet >>= ? OR revnet <<= ?)".
-        ($args{location} ? " AND default_location = ?" : '');
+  $args{return_location} = 1 if !defined($args{return_location});
+
+  my $sql = "SELECT rdns_id,revnet".($args{return_location} ? ',default_location' : '').
+        " FROM revzones WHERE (revnet >>= ? OR revnet <<= ?)".
+        (defined($args{location}) ? " AND default_location = ?" : '');
   my @svals = ($args{cidr}, $args{cidr});
-  push @svals, $args{location} if $args{location};
+  push @svals, $args{location} if defined $args{location};
 
   my $result = $dbh->selectall_arrayref($sql, { Slice => {} }, @svals );