use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
use PublicInbox::View;
use PublicInbox::WwwAtomStream;
-use PublicInbox::MID qw(mid2path mid_mime mid_clean mid_escape MID_ESC);
+use PublicInbox::MID qw(MID_ESC);
use PublicInbox::MIME;
require PublicInbox::Git;
require PublicInbox::SearchThread;
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);
}
my $code = 200;
# double the limit for expanded views:
my $opts = {
- limit => $LIM,
+ limit => $q->{l},
offset => $q->{o},
mset => 1,
relevance => $q->{r},
sub search_nav_bot {
my ($mset, $q) = @_;
my $total = $mset->get_matches_estimated;
- my $nr = scalar $mset->items;
my $o = $q->{o};
- my $end = $o + $nr;
+ my $l = $q->{l};
+ my $end = $o + $mset->size;
my $beg = $o + 1;
my $rv = '</pre><hr><pre id=t>';
if ($beg <= $end) {
} 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 $r = $q->{r};
my $rootset = PublicInbox::SearchThread::thread($msgs,
$r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ds,
- $srch);
+ $ctx);
my $skel = search_nav_bot($mset, $q). "<pre>";
my $inbox = $ctx->{-inbox};
$ctx->{-upfx} = '';
$ctx->{pct} = \%pct;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
- $ctx->{seen} = {};
$ctx->{s_nr} = scalar(@$msgs).'+ results';
# reduce hash lookups in skel_dump
*PublicInbox::View::pre_thread);
@$msgs = reverse @$msgs if $r;
- my $mime;
sub {
return unless $msgs;
- while ($mime = pop @$msgs) {
- $mime = $inbox->msg_by_smsg($mime) and last;
+ my $smsg;
+ while (my $m = pop @$msgs) {
+ $smsg = $inbox->smsg_mime($m) and last;
}
- if ($mime) {
- $mime = PublicInbox::MIME->new($mime);
- return PublicInbox::View::index_entry($mime, $ctx,
+ if ($smsg) {
+ return PublicInbox::View::index_entry($smsg, $ctx,
scalar @$msgs);
}
$msgs = undef;
PublicInbox::WwwAtomStream->response($ctx, 200, sub {
while (my $x = shift @items) {
$x = load_doc_retry($srch, $x);
- $x = $ibx->msg_by_smsg($x) and
- return PublicInbox::MIME->new($x);
+ $x = $ibx->smsg_mime($x) and return $x;
}
return undef;
});
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" unless $l == $LIM;
+ }
if (my $r = $self->{r}) {
$qs .= "&r";
}