Merge remote-tracking branch 'origin/master' into v2

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index d038dfcac761912f9338783be5ea164469dcbdf7..5d500c1b2ee655c26c214e9f75e36d427ecc7b7b 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -22,6 +22,7 @@ sub mbox_results {
        my ($ctx) = @_;
        my $q = PublicInbox::SearchQuery->new($ctx->{qp});
        my $x = $q->{x};
+       require PublicInbox::Mbox;
        return PublicInbox::Mbox::mbox_all($ctx, $q->{'q'}) if $x eq 'm';
        sres_top_html($ctx);
 }
@@ -35,7 +36,7 @@ sub sres_top_html {
        my $code = 200;
        # double the limit for expanded views:
        my $opts = {
-               limit => $LIM,
+               limit => $q->{l},
                offset => $q->{o},
                mset => 1,
                relevance => $q->{r},
@@ -181,6 +182,7 @@ 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>';
@@ -190,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>};
        }
@@ -305,10 +307,13 @@ sub new {
        my ($class, $qp) = @_;
 
        my $r = $qp->{r};
+       my ($l) = (($qp->{l} || '') =~ /(\d+)/);
+       $l = $LIM if !$l || $l > $LIM;
        bless {
                q => $qp->{'q'},
                x => $qp->{x} || '',
                o => (($qp->{o} || '0') =~ /(\d+)/),
+               l => $l,
                r => (defined $r && $r ne '0'),
        }, $class;
 }
@@ -331,6 +336,9 @@ 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";
        }