X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=5d500c1b2ee655c26c214e9f75e36d427ecc7b7b;hb=cfb8d16578e7f2f2e300f9f436205e4a8fc7f322;hp=53b88c34d284f67194e53272b3a3bf2a1a95db3e;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 53b88c34..5d500c1b 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -10,7 +10,7 @@ use PublicInbox::SearchMsg; 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; @@ -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}, @@ -117,11 +118,11 @@ sub mset_summary { obfuscate_addrs($obfs_ibx, $s); obfuscate_addrs($obfs_ibx, $f); } - my $ts = PublicInbox::View::fmt_ts($smsg->ts); + my $date = PublicInbox::View::fmt_ts($smsg->ds); my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href}; $$res .= qq{$rank. }. $s . "\n"; - $$res .= "$pfx - by $f @ $ts UTC [$pct%]\n\n"; + $$res .= "$pfx - by $f @ $date UTC [$pct%]\n\n"; } $$res .= search_nav_bot($mset, $q); *noop; @@ -180,9 +181,9 @@ sub search_nav_top { 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 = '
'; if ($beg <= $end) { @@ -191,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{ 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}; } @@ -227,8 +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, - $srch); + $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ds, + $ctx); my $skel = search_nav_bot($mset, $q). ""; my $inbox = $ctx->{-inbox}; $ctx->{-upfx} = ''; @@ -248,15 +249,14 @@ sub mset_thread { *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; @@ -290,8 +290,7 @@ sub adump { 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; }); @@ -308,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; } @@ -334,6 +336,9 @@ sub qs_html { 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"; }