lib/PublicInbox/SearchView.pm | 17 +++++++++++++---- diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 53b88c34d284f67194e53272b3a3bf2a1a95db3e..bf4415f011b8ea79603a1de8c4da348b312e9d08 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -35,7 +35,7 @@ my $code = 200; # double the limit for expanded views: my $opts = { - limit => $LIM, + limit => $q->{l}, offset => $q->{o}, mset => 1, relevance => $q->{r}, @@ -182,6 +182,7 @@ my ($mset, $q) = @_; 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 = '
';
@@ -191,15 +192,15 @@ $rv .= ' (estimated)' if $end != $total;
} 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{ next}
}
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{prev};
}
@@ -308,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;
}
@@ -333,6 +339,9 @@ my $qs = "q=$q";
if (my $o = $self->{o}) { # ignore o == 0
$qs .= "&o=$o";
+ }
+ if (my $l = $self->{l}) {
+ $qs .= "&l=$l";
}
if (my $r = $self->{r}) {
$qs .= "&r";