config: support "inboxdir" in addition to "mainrepo"

[public-inbox.git] / lib / PublicInbox / SearchView.pm

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 6592b3b28e27363c769c381d510d3e318535ce90..78f2bd8b20d43edc0de2fdfd1c33c4206a27396e 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Displays search results for the web interface
@@ -15,6 +15,7 @@ use PublicInbox::MIME;
 require PublicInbox::Git;
 require PublicInbox::SearchThread;
 our $LIM = 200;
+my %rmap_inc;
 
 sub noop {}
 
@@ -34,14 +35,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:
@@ -131,10 +139,27 @@ sub mset_summary {
        *noop;
 }
 
+# shorten "/full/path/to/Foo/Bar.pm" to "Foo/Bar.pm" so error
+# messages don't reveal FS layout info in case people use non-standard
+# installation paths
+sub path2inc ($) {
+       my $full = $_[0];
+       if (my $short = $rmap_inc{$full}) {
+               return $short;
+       } elsif (!scalar(keys %rmap_inc) && -e $full) {
+               %rmap_inc = map {; "$INC{$_}" => $_ } keys %INC;
+               # fall back to basename as last resort
+               $rmap_inc{$full} // (split('/', $full))[-1];
+       } else {
+               $full;
+       }
+}
+
 sub err_txt {
        my ($ctx, $err) = @_;
        my $u = $ctx->{-inbox}->base_url($ctx->{env}) . '_/text/help/';
        $err =~ s/^\s*Exception:\s*//; # bad word to show users :P
+       $err =~ s!(\S+)!path2inc($1)!sge;
        $err = ascii_html($err);
        "\nBad query: <b>$err</b>\n" .
                qq{See <a\nhref="$u">$u</a> for help on using search};
@@ -184,30 +209,50 @@ 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 = '</pre><hr><pre id=t>';
+       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{  <a\nhref="?$qs"\nrel=next>next</a>}
-       }
-       if ($o > 0) {
-               $rv .= $n < $total ? '/' : '       ';
-               my $p = $o - $l;
-               my $qs = $q->qs_html(o => ($p > 0 ? $p : 0));
-               $rv .= qq{<a\nhref="?$qs"\nrel=prev>prev</a>};
+       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 .= '</pre>';
+
+       $rv .= qq{  <a\nhref="?$next"\nrel=next>next</a>} if $next;
+       $rv .= $join if $join;
+       $rv .= qq{<a\nhref="?$prev"\nrel=prev>prev</a>} if $prev;
+
+       my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
+       $rv .= qq{ | <a\nhref="?$rev">reverse results</a></pre>};
 }
 
 sub sort_relevance {
@@ -308,12 +353,12 @@ sub new {
        my ($class, $qp) = @_;
 
        my $r = $qp->{r};
-       my ($l) = (($qp->{l} || '') =~ /(\d+)/);
+       my ($l) = (($qp->{l} || '') =~ /([0-9]+)/);
        $l = $LIM if !$l || $l > $LIM;
        bless {
                q => $qp->{'q'},
                x => $qp->{x} || '',
-               o => (($qp->{o} || '0') =~ /(\d+)/),
+               o => (($qp->{o} || '0') =~ /(-?[0-9]+)/),
                l => $l,
                r => (defined $r && $r ne '0'),
        }, $class;