Changeset 787 for trunk

Timestamp:

08/23/19 15:24:59 (5 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit longstanding refinement of getZonesByCIDR()

• improved sub header docucomment
• add sorting, with fallback to "whatever the database spits out" if the caller doesn't send literal ASC or DESC

File:

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

trunk/DNSDB.pm

@@ -5497 +5497 @@
 ## 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
-# Optionally leave off the default_location field
+# Arguments must be passed in a hash
+# Requires an argument "cidr" for the CIDR block to find parent/child zone(s) for
+# Accepts optional arguments:
+# - return_location:  Flag indicating whether to return default_location or not
+# - location: Restrict matches to a particular location/view
+# - sort:  Valid values are ASC or DESC;  if omitted or set to something else
+#   results will be "whatever the database returns"
 sub getZonesByCIDR {
   my $self = shift;
@@ -5508 +5513 @@
         " FROM revzones WHERE (revnet >>= ? OR revnet <<= ?)".
         (defined($args{location}) ? " AND default_location = ?" : '');
+  if ($args{sort}) {
+    if ($args{sort} eq 'ASC' || $args{sort} eq 'DESC') {
+      $sql .= " ORDER BY revnet $args{sort}";
+    }
+  }
   my @svals = ($args{cidr}, $args{cidr});
   push @svals, $args{location} if defined $args{location};