X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=fbef4116e9623f2838f17cf0c4fc31c9ff31acaf;hb=5c5dfb7d5558ff248477fa57aef08e2a8bbd9800;hp=ab0ff19a57e8eb9d37c140d06e6a613de06a698b;hpb=0b766f54ad829d08cc7bd66fffc8ed8515241dc3;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index ab0ff19a..fbef4116 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -8,14 +8,15 @@ use warnings;
use PublicInbox::SearchMsg;
use PublicInbox::Hval qw/ascii_html/;
use PublicInbox::View;
-use PublicInbox::MID qw(mid2path mid_clean mid_mime);
+use PublicInbox::MID qw(mid2path mid_mime);
use Email::MIME;
require PublicInbox::Git;
+require PublicInbox::Thread;
our $LIM = 50;
sub sres_top_html {
my ($ctx) = @_;
- my $q = PublicInbox::SearchQuery->new($ctx->{cgi});
+ my $q = PublicInbox::SearchQuery->new($ctx->{qp});
my $code = 200;
# double the limit for expanded views:
@@ -126,13 +127,13 @@ sub search_nav_bot {
if ($n < $total) {
my $qs = $q->qs_html(o => $n);
- $rv .= qq{, next}
+ $rv .= qq{, next}
}
if ($o > 0) {
$rv .= $n < $total ? '/' : ', ';
my $p = $o - $LIM;
my $qs = $q->qs_html(o => ($p > 0 ? $p : 0));
- $rv .= qq{prev};
+ $rv .= qq{prev};
}
$rv;
}
@@ -150,69 +151,46 @@ sub tdump {
$m;
} ($mset->items);
- require PublicInbox::Thread;
my $th = PublicInbox::Thread->new(@m);
- {
- no warnings 'once';
- $Mail::Thread::nosubject = 0;
- }
$th->thread;
- if ($q->{r}) {
+ if ($q->{r}) { # order by relevance
$th->order(sub {
sort { (eval { $pct{$b->topmost->messageid} } || 0)
<=>
(eval { $pct{$a->topmost->messageid} } || 0)
} @_;
});
- } else {
- no warnings 'once';
- $th->order(*PublicInbox::View::rsort_ts);
+ } else { # order by time (default for threaded view)
+ $th->order(*PublicInbox::View::sort_ts);
}
-
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
+ my $skel = '';
my $state = {
+ -inbox => $ctx->{-inbox},
+ anchor_idx => 1,
ctx => $ctx,
- anchor_idx => 0,
- pct => \%pct,
cur_level => 0,
+ dst => \$skel,
fh => $fh,
+ mapping => {},
+ pct => \%pct,
+ prev_attr => '',
+ prev_level => 0,
+ seen => {},
+ srch => $ctx->{srch},
+ upfx => './',
};
$ctx->{searchview} = 1;
- tdump_ent($git, $state, $_, 0) for $th->rootset;
- PublicInbox::View::thread_adj_level($state, 0);
- Email::Address->purge_cache;
+ PublicInbox::View::walk_thread($th, $state,
+ *PublicInbox::View::pre_thread);
+
+ PublicInbox::View::thread_entry($state, $_, 0) for @m;
- $fh->write(search_nav_bot($mset, $q). "\n\n" .
+ $fh->write(search_nav_bot($mset, $q). "\n\n" . $skel . "\n" .
foot($ctx). '