Changeset 104 for trunk

Timestamp:

07/15/11 15:41:54 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak getDomRecs() to "correctly" sort domain records on type

(alphabetic instead of DNS RR type number)

File:

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

trunk/DNSDB.pm

@@ -1061 +1061 @@
   $sql .= "default_" if $type eq 'y';
   $sql .= "records r ";
+  $sql .= "INNER JOIN rectypes t ON r.type=t.val ";     # for sorting by type alphabetically
   $sql .= "LEFT OUTER JOIN longrecs l ON r.longrec_id=l.longrec_id ";
   if ($type eq 'y') {
@@ -1067 +1068 @@
     $sql .= "WHERE r.domain_id=?";
   }
-  $sql .= " AND NOT r.type=$reverse_typemap{SOA} ORDER BY r.$order $direction";
+  $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
+  # 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 .= " LIMIT $nrecs OFFSET ".($nstart*$nrecs) if $nstart ne 'all';