X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=f0d803ea1583b616b6c9451aec298175b49aa8d8;hb=0f7c7d634f3018591dee65650bbc6f6a5cc18dbc;hp=b089de9c91412cb1e4e42a431256b97c8ebafa63;hpb=3b508de80a200e9a32adbdc437434339187dde88;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index b089de9c..f0d803ea 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -34,14 +34,21 @@ sub sres_top_html { my $q = PublicInbox::SearchQuery->new($ctx->{qp}); my $x = $q->{x}; my $query = $q->{'q'}; + my $o = $q->{o}; + my $asc; + if ($o < 0) { + $asc = 1; + $o = -($o + 1); # so [-1] is the last element, like Perl lists + } my $code = 200; # double the limit for expanded views: my $opts = { limit => $q->{l}, - offset => $q->{o}, + offset => $o, mset => 1, relevance => $q->{r}, + asc => $asc, }; my ($mset, $total, $err, $cb); retry: @@ -184,29 +191,47 @@ sub search_nav_top { sub search_nav_bot { my ($mset, $q) = @_; my $total = $mset->get_matches_estimated; - my $o = $q->{o}; my $l = $q->{l}; - my $end = $o + $mset->size; - my $beg = $o + 1; my $rv = '
'; + my $o = $q->{o}; + my $off = $o < 0 ? -($o + 1) : $o; + my $end = $off + $mset->size; + my $beg = $off + 1; + if ($beg <= $end) { $rv .= "Results $beg-$end of $total"; $rv .= ' (estimated)' if $end != $total; } else { $rv .= "No more results, only $total"; } - my $n = $o + $l; + my ($next, $join, $prev); - if ($n < $total) { - my $qs = $q->qs_html(o => $n, l => $l); - $rv .= qq{ next} - } - if ($o > 0) { - $rv .= $n < $total ? '/' : ' '; - my $p = $o - $l; - my $qs = $q->qs_html(o => ($p > 0 ? $p : 0)); - $rv .= qq{prev}; + if ($o >= 0) { # sort descending + my $n = $o + $l; + if ($n < $total) { + $next = $q->qs_html(o => $n, l => $l); + } + if ($o > 0) { + $join = $n < $total ? '/' : ' '; + my $p = $o - $l; + $prev = $q->qs_html(o => ($p > 0 ? $p : 0)); + } + } else { # o < 0, sort ascending + my $n = $o - $l; + + if (-$n < $total) { + $next = $q->qs_html(o => $n, l => $l); + } + if ($o < -1) { + $join = -$n < $total ? '/' : ' '; + my $p = $o + $l; + $prev = $q->qs_html(o => ($p < 0 ? $p : 0)); + } } + + $rv .= qq{ next} if $next; + $rv .= $join if $join; + $rv .= qq{prev} if $prev; $rv .= ''; } @@ -313,7 +338,7 @@ sub new { bless { q => $qp->{'q'}, x => $qp->{x} || '', - o => (($qp->{o} || '0') =~ /([0-9]+)/), + o => (($qp->{o} || '0') =~ /(-?[0-9]+)/), l => $l, r => (defined $r && $r ne '0'), }, $class;