X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=f1c4b6a052181e28c28127403a07d3732972151b;hb=c41c7aa95d55dcff7cb01a744bbf1bfb200e23b4;hp=bd634d8dbd29ead4f86c757dd421e8cf9c6fccf4;hpb=90b3d23352a0c37680ac266acaf4fef73a781bc9;p=public-inbox.git diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index bd634d8d..f1c4b6a0 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -10,10 +10,10 @@ use PublicInbox::Hval qw/ascii_html/; use PublicInbox::View; use PublicInbox::WwwAtomStream; use PublicInbox::MID qw(mid2path mid_mime mid_clean mid_escape); -use Email::MIME; +use PublicInbox::MIME; require PublicInbox::Git; require PublicInbox::SearchThread; -our $LIM = 50; +our $LIM = 200; sub noop {} @@ -145,15 +145,21 @@ sub search_nav_bot { my $o = $q->{o}; my $end = $o + $nr; my $beg = $o + 1; - my $rv = "
Results $beg-$end of $total"; + my $rv = '
'; + if ($beg <= $end) { + $rv .= "Results $beg-$end of $total"; + $rv .= ' (estimated)' if $end != $total; + } else { + $rv .= "No more results, only $total"; + } my $n = $o + $LIM; if ($n < $total) { my $qs = $q->qs_html(o => $n); - $rv .= qq{, next} + $rv .= qq{ next} } if ($o > 0) { - $rv .= $n < $total ? '/' : ', '; + $rv .= $n < $total ? '/' : ' '; my $p = $o - $LIM; my $qs = $q->qs_html(o => ($p > 0 ? $p : 0)); $rv .= qq{prev}; @@ -205,7 +211,7 @@ sub mset_thread { $mime = $inbox->msg_by_smsg($mime) and last; } if ($mime) { - $mime = Email::MIME->new($mime); + $mime = PublicInbox::MIME->new($mime); return PublicInbox::View::index_entry($mime, $ctx, scalar @$msgs); } @@ -239,7 +245,7 @@ sub adump { while (my $x = shift @items) { $x = load_doc_retry($srch, $x); $x = $ibx->msg_by_smsg($x) and - return Email::MIME->new($x); + return PublicInbox::MIME->new($x); } return undef; });