Changeset 324 for trunk

Timestamp:

05/02/12 13:23:13 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Add consistency to log entry and record list sorts by adding
secondary sort on log_id or record_id respectively

File:

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

trunk/DNSDB.pm

@@ -2723 +2723 @@
   # 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";
+  # ensure consistent ordering by sorting on record_id too
+  $sql .= ", record_id $direction";
 
   my @bindvars = ($id);
@@ -3133 +3135 @@
   $args{offset} = 0 if !$args{offset};
 
-  my %sortmap = (fname => 'name', username => 'email', entry => 'entry', stamp => 'stamp,log_id');
+  my %sortmap = (fname => 'name', username => 'email', entry => 'entry', stamp => 'stamp');
   $args{sortby} = $sortmap{$args{sortby}};
 
@@ -3141 +3143 @@
         "WHERE $id_col{$args{logtype}}=?".
         ($args{filter} ? " AND entry ~* ?" : '').
-        " ORDER BY $args{sortby} $args{sortorder}".
+        " ORDER BY $args{sortby} $args{sortorder}, log_id $args{sortorder}".
         ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage} OFFSET ".$args{offset}*$config{perpage});
   my $loglist = $dbh->selectall_arrayref($sql, { Slice => {} }, ($args{id}, @filterargs) );