www: implement hybrid flat+thread conversation view

[public-inbox.git] / lib / PublicInbox / SearchView.pm

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 6f67a37e258610f4713b8a2b9b0c601330ad0e55..fbef4116e9623f2838f17cf0c4fc31c9ff31acaf 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -151,7 +151,6 @@ sub tdump {
                $m;
        } ($mset->items);
 
-       my @rootset;
        my $th = PublicInbox::Thread->new(@m);
        $th->thread;
        if ($q->{r}) { # order by relevance
@@ -164,48 +163,34 @@ sub tdump {
        } else { # order by time (default for threaded view)
                $th->order(*PublicInbox::View::sort_ts);
        }
-       @rootset = $th->rootset;
+       my $skel = '';
        my $state = {
+               -inbox => $ctx->{-inbox},
+               anchor_idx => 1,
                ctx => $ctx,
-               anchor_idx => 0,
-               pct => \%pct,
                cur_level => 0,
-               -inbox => $ctx->{-inbox},
+               dst => \$skel,
                fh => $fh,
+               mapping => {},
+               pct => \%pct,
+               prev_attr => '',
+               prev_level => 0,
+               seen => {},
+               srch => $ctx->{srch},
+               upfx => './',
        };
        $ctx->{searchview} = 1;
-       tdump_ent($state, $_, 0) for @rootset;
-       PublicInbox::View::thread_adj_level($state, 0);
+       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). '</pre></body></html>');
 
        $fh->close;
 }
 
-sub tdump_ent {
-       my ($state, $node, $level) = @_;
-       return unless $node;
-       my $mime = $node->message;
-
-       if ($mime) {
-               # lazy load the full message from mini_mime:
-               my $mid = mid_mime($mime);
-               $mime = eval { $state->{-inbox}->msg_by_mid($mid) } and
-                       $mime = Email::MIME->new($mime);
-       }
-       if ($mime) {
-               my $end = PublicInbox::View::thread_adj_level($state, $level);
-               PublicInbox::View::index_entry($mime, $level, $state);
-               $state->{fh}->write($end) if $end;
-       } else {
-               my $mid = $node->messageid;
-               PublicInbox::View::ghost_flush($state, '', $mid, $level);
-       }
-       tdump_ent($state, $node->child, $level + 1);
-       tdump_ent($state, $node->next, $level);
-}
-
 sub foot {
        my ($ctx) = @_;
        my $foot = $ctx->{footer} || '';