Changeset 352

Timestamp:

06/27/12 17:07:33 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak getDomRecs() to return reverse zone entries sorted by val
in the "correct" order by casting val as inet.

See #26

File:

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

trunk/DNSDB.pm

@@ -3039 +3039 @@
   my $filter = shift || '';
 
+  # sort reverse zones on IP, correctly
+  # do other fiddling with $order while we're at it.
+  $order = "r.$order";
+  $order = 'CAST (r.val AS inet)' if $rev eq 'y' && $order eq 'r.val';
+  $order = 't.alphaorder' if $order eq 'r.type';
+
   my $sql = "SELECT r.record_id,r.host,r.type,r.val,r.ttl";
   $sql .= ",r.distance,r.weight,r.port" if $rev eq 'n';
@@ -3047 +3053 @@
   $sql .= " AND host ~* ?" if $filter;
   # use alphaorder column for "correct" ordering of sort-by-type instead of DNS RR type number
-  $sql .= " ORDER BY ".($order eq 'type' ? 't.alphaorder' : "r.$order")." $direction";
+  $sql .= " ORDER BY $order $direction";
   # ensure consistent ordering by sorting on record_id too
   $sql .= ", record_id $direction";