1 files changed, 12 insertions, 15 deletions

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 1c4442e4..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;
@@ -118,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. <b><a\nhref="$mid/">}.
                         $s . "</a></b>\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;
@@ -181,10 +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 $l = $q->{l};
-        my $end = $o + $nr;
+        my $end = $o + $mset->size;
         my $beg = $o + 1;
         my $rv = '</pre><hr><pre id=t>';
         if ($beg <= $end) {
@@ -229,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). "<pre>";
         my $inbox = $ctx->{-inbox};
         $ctx->{-upfx} = '';
@@ -250,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;
@@ -292,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;
         });