Allow specification of the number of search results to return

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index a5974034d20a3335ddc517e50d7b9c3e181b4b98..bf4415f011b8ea79603a1de8c4da348b312e9d08 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 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
 package PublicInbox::SearchView;
@@ -18,14 +18,24 @@ our $LIM = 200;
 
 sub noop {}
 
+sub mbox_results {
+       my ($ctx) = @_;
+       my $q = PublicInbox::SearchQuery->new($ctx->{qp});
+       my $x = $q->{x};
+       return PublicInbox::Mbox::mbox_all($ctx, $q->{'q'}) if $x eq 'm';
+       sres_top_html($ctx);
+}
+
 sub sres_top_html {
        my ($ctx) = @_;
        my $q = PublicInbox::SearchQuery->new($ctx->{qp});
-       my $code = 200;
+       my $x = $q->{x};
+       my $query = $q->{'q'};
 
+       my $code = 200;
        # double the limit for expanded views:
        my $opts = {
-               limit => $LIM,
+               limit => $q->{l},
                offset => $q->{o},
                mset => 1,
                relevance => $q->{r},
@@ -33,7 +43,7 @@ sub sres_top_html {
        my ($mset, $total, $err, $cb);
 retry:
        eval {
-               $mset = $ctx->{srch}->query($q->{'q'}, $opts);
+               $mset = $ctx->{srch}->query($query, $opts);
                $total = $mset->get_matches_estimated;
        };
        $err = $@;
@@ -55,10 +65,9 @@ retry:
                $ctx->{-html_tip} = "<pre>\n[No results found]</pre><hr>";
                $cb = *noop;
        } else {
-               my $x = $q->{x};
                return adump($_[0], $mset, $q, $ctx) if $x eq 'A';
 
-               $ctx->{-html_tip} = search_nav_top($mset, $q, $ctx) . "\n\n";
+               $ctx->{-html_tip} = search_nav_top($mset, $q, $ctx);
                if ($x eq 't') {
                        $cb = mset_thread($ctx, $mset, $q);
                } else {
@@ -79,7 +88,7 @@ sub load_doc_retry {
        }
 }
 
-# display non-threaded search results similar to what users expect from
+# display non-nested search results similar to what users expect from
 # regular WWW search engines:
 sub mset_summary {
        my ($ctx, $mset, $q) = @_;
@@ -129,8 +138,8 @@ sub err_txt {
 
 sub search_nav_top {
        my ($mset, $q, $ctx) = @_;
-
-       my $rv = '<pre>';
+       my $m = $q->qs_html(x => 'm', r => undef);
+       my $rv = qq{<form\naction="?$m"\nmethod="post"><pre>};
        my $initial_q = $ctx->{-uxs_retried};
        if (defined $initial_q) {
                my $rewritten = $q->{'q'};
@@ -157,13 +166,15 @@ sub search_nav_top {
        my $x = $q->{x};
        if ($x eq '') {
                my $t = $q->qs_html(x => 't');
-               $rv .= qq{<b>summary</b>|<a\nhref="?$t">threaded</a>}
+               $rv .= qq{<b>summary</b>|<a\nhref="?$t">nested</a>}
        } elsif ($q->{x} eq 't') {
                my $s = $q->qs_html(x => '');
-               $rv .= qq{<a\nhref="?$s">summary</a>|<b>threaded</b>};
+               $rv .= qq{<a\nhref="?$s">summary</a>|<b>nested</b>};
        }
        my $A = $q->qs_html(x => 'A', r => undef);
        $rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
+       $rv .= qq{\n\t\t\t\t\t\tdownload: };
+       $rv .= qq{<input\ntype=submit\nvalue="mbox.gz"/></pre></form><pre>};
 }
 
 sub search_nav_bot {
@@ -171,6 +182,7 @@ sub search_nav_bot {
        my $total = $mset->get_matches_estimated;
        my $nr = scalar $mset->items;
        my $o = $q->{o};
+       my $l = $q->{l};
        my $end = $o + $nr;
        my $beg = $o + 1;
        my $rv = '</pre><hr><pre id=t>';
@@ -180,15 +192,15 @@ sub search_nav_bot {
        } else {
                $rv .= "No more results, only $total";
        }
-       my $n = $o + $LIM;
+       my $n = $o + $l;
 
        if ($n < $total) {
-               my $qs = $q->qs_html(o => $n);
+               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 - $LIM;
+               my $p = $o - $l;
                my $qs = $q->qs_html(o => ($p > 0 ? $p : 0));
                $rv .= qq{<a\nhref="?$qs"\nrel=prev>prev</a>};
        }
@@ -207,7 +219,8 @@ sub sort_relevance {
 sub mset_thread {
        my ($ctx, $mset, $q) = @_;
        my %pct;
-       my $msgs = $ctx->{srch}->retry_reopen(sub { [ map {
+       my $srch = $ctx->{srch};
+       my $msgs = $srch->retry_reopen(sub { [ map {
                my $i = $_;
                my $smsg = PublicInbox::SearchMsg->load_doc($i->get_document);
                $pct{$smsg->mid} = $i->get_percent;
@@ -215,7 +228,8 @@ sub mset_thread {
        } ($mset->items) ]});
        my $r = $q->{r};
        my $rootset = PublicInbox::SearchThread::thread($msgs,
-               $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts);
+               $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts,
+               $srch);
        my $skel = search_nav_bot($mset, $q). "<pre>";
        my $inbox = $ctx->{-inbox};
        $ctx->{-upfx} = '';
@@ -295,10 +309,15 @@ sub new {
        my ($class, $qp) = @_;
 
        my $r = $qp->{r};
+       my $l = $qp->{l} || '200';
+       if (! ($l =~ /(\d+)/ && $l <= $LIM)) {
+               $l = $LIM;
+       }
        bless {
                q => $qp->{'q'},
                x => $qp->{x} || '',
                o => (($qp->{o} || '0') =~ /(\d+)/),
+               l => $l,
                r => (defined $r && $r ne '0'),
        }, $class;
 }
@@ -321,11 +340,14 @@ sub qs_html {
        if (my $o = $self->{o}) { # ignore o == 0
                $qs .= "&amp;o=$o";
        }
+       if (my $l = $self->{l}) {
+               $qs .= "&amp;l=$l";
+       }
        if (my $r = $self->{r}) {
                $qs .= "&amp;r";
        }
        if (my $x = $self->{x}) {
-               $qs .= "&amp;x=$x" if ($x eq 't' || $x eq 'A');
+               $qs .= "&amp;x=$x" if ($x eq 't' || $x eq 'A' || $x eq 'm');
        }
        $qs;
 }