Changeset 422 for branches/stable/DNSDB.pm

Timestamp:

10/10/12 13:41:00 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge plaintext record list feature from /trunk r420 and r421,
with minor changes to account for no reverse records.
Bump patch version.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• DNSDB.pm (modified) (3 diffs)

branches/stable/DNSDB.pm

@@ -32 +32 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-$VERSION        = 1.0.2;        ##VERSION##
+$VERSION        = 1.0.3;        ##VERSION##
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
@@ -1315 +1315 @@
   $sql .= "default_" if $type eq 'y';
   $sql .= "records r ";
+
+  # whee!  multisort means just passing comma-separated fields in sortby!
+  my $newsort = '';
+  foreach my $sf (split /,/, $order) {
+    $sf = "r.$sf";
+    $sf =~ s/r\.type/t.alphaorder/;
+    $newsort .= ",$sf";
+  }
+  $newsort =~ s/^,//;
+
   $sql .= "INNER JOIN rectypes t ON r.type=t.val ";     # for sorting by type alphabetically
   if ($type eq 'y') {
@@ -1324 +1334 @@
   $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 $newsort $direction";
   $sql .= " LIMIT $nrecs OFFSET ".($nstart*$nrecs) if $nstart ne 'all';