Instead of only passing an Inbox object, we'll pass the $ctx
reference as PublicInbox::SearchView::mset_thread did.
So although mset_thread was wrong, we now make it's usage
of SearchThread::thread correct and update other callers to
favor the new style of passing the entire $ctx (with ->{-inbox})
instead of just the Inbox object.
This makes the thread skeleton at the bottom of the search
page to show subjects of messages, but unfortunately links to
non-existent #anchors. The next commit will fix that.
While we're at it, favor "\&foo" over "*foo" since the former
makes the code reference (aka "function pointer) obvious so it
won't be confused for other things named "foo" in that
scope (e.g. $foo/@foo/%foo).
use warnings;
sub thread {
use warnings;
sub thread {
- my ($msgs, $ordersub, $ibx) = @_;
+ my ($msgs, $ordersub, $ctx) = @_;
my $id_table = {};
# Sadly, we sort here anyways since the fill-in-the-blanks References:
my $id_table = {};
# Sadly, we sort here anyways since the fill-in-the-blanks References:
# We'll trust the client Date: header here instead of the Received:
# time since this is for display (and not retrieval)
_add_message($id_table, $_) for sort { $a->{ds} <=> $b->{ds} } @$msgs;
# We'll trust the client Date: header here instead of the Received:
# time since this is for display (and not retrieval)
_add_message($id_table, $_) for sort { $a->{ds} <=> $b->{ds} } @$msgs;
+ my $ibx = $ctx->{-inbox};
my $rootset = [ grep {
!delete($_->{parent}) && $_->visible($ibx)
} values %$id_table ];
$id_table = undef;
$rootset = $ordersub->($rootset);
my $rootset = [ grep {
!delete($_->{parent}) && $_->visible($ibx)
} values %$id_table ];
$id_table = undef;
$rootset = $ordersub->($rootset);
- $_->order_children($ordersub, $ibx) for @$rootset;
+ $_->order_children($ordersub, $ctx) for @$rootset;
- my ($cur, $ordersub, $ibx) = @_;
+ my ($cur, $ordersub, $ctx) = @_;
my %seen = ($cur => 1); # self-referential loop prevention
my @q = ($cur);
my %seen = ($cur => 1); # self-referential loop prevention
my @q = ($cur);
+ my $ibx = $ctx->{-inbox};
while (defined($cur = shift @q)) {
my $c = $cur->{children}; # The hashref here...
while (defined($cur = shift @q)) {
my $c = $cur->{children}; # The hashref here...
} ($mset->items) ]});
my $r = $q->{r};
my $rootset = PublicInbox::SearchThread::thread($msgs,
} ($mset->items) ]});
my $r = $q->{r};
my $rootset = PublicInbox::SearchThread::thread($msgs,
- $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ds,
+ $r ? sort_relevance(\%pct) : \&PublicInbox::View::sort_ds,
$ctx);
my $skel = search_nav_bot($mset, $q). "<pre>";
$ctx->{-upfx} = '';
$ctx);
my $skel = search_nav_bot($mset, $q). "<pre>";
$ctx->{-upfx} = '';
sub thread_results {
my ($ctx, $msgs) = @_;
require PublicInbox::SearchThread;
sub thread_results {
my ($ctx, $msgs) = @_;
require PublicInbox::SearchThread;
- my $ibx = $ctx->{-inbox};
- my $rootset = PublicInbox::SearchThread::thread($msgs, *sort_ds, $ibx);
+ my $rootset = PublicInbox::SearchThread::thread($msgs, \&sort_ds, $ctx);
# FIXME: `tid' is broken on --reindex, so that needs to be fixed
# and preserved in the future. This bug is hidden by `sid' matches
# FIXME: `tid' is broken on --reindex, so that needs to be fixed
# and preserved in the future. This bug is hidden by `sid' matches