-# 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;
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 $x = $q->{x};
my $query = $q->{'q'};
- return PublicInbox::Mbox::mbox_all($ctx, $query) if $x eq 'm';
my $code = 200;
# double the limit for expanded views:
my $opts = {
- limit => $LIM,
+ limit => $q->{l},
offset => $q->{o},
mset => 1,
relevance => $q->{r},
} else {
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 {
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'};
}
my $A = $q->qs_html(x => 'A', r => undef);
$rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
- my $m = $q->qs_html(x => 'm', r => undef);
- warn "m: $m\n";
$rv .= qq{\n\t\t\t\t\t\tdownload: };
- $rv .= qq{<a\nhref="?$m"\nrel="nofollow">mbox.gz</a>};
+ $rv .= qq{<input\ntype=submit\nvalue="mbox.gz"/></pre></form><pre>};
}
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>';
} 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>};
}
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;
}
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";
}