From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 7990B1F452 for ; Thu, 30 Mar 2023 11:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1680174113; bh=rhIhOU89nKiJCFJ9qMwp2MQykLsVubT28mmYurGuRBQ=; h=From:To:Subject:Date:From; b=bJXt2KLuunyI84smASde6RNwn5S890+y4NtG9VDXa0/+0Ec8dhC97fGQY+DFH8Ms3 75xqT5dv1ZAXgdw24j5VyHab2gMFeB5ZtjfzY/8dPKPFV8ALPIHhoWJ0GWq8axf7Ay 0ztz10g8it2h7EApi14tfZyk0+tTIkou84e/QdoQ= From: Eric Wong To: spew@80x24.org Subject: [PATCH] WIP thread-search HTML Date: Thu, 30 Mar 2023 11:01:53 +0000 Message-Id: <20230330110153.3744099-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: --- lib/PublicInbox/SearchView.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 07fef40c..f01edf7f 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -50,6 +50,12 @@ sub sres_top_html { threads => $q->{t}, asc => $asc, }; + if (defined($ctx->{mid})) { + my $over = $ctx->{ibx}->over or + return PublicInbox::WWW::need($ctx, 'Over'); + $opts->{threadid} = $over->mid2tid($ctx->{mid}); + $ctx->{-upfx} = '../'; + } my ($mset, $total, $err, $html); retry: eval { @@ -99,6 +105,7 @@ sub mset_summary { my @nums = @{$ibx->isrch->mset_to_artnums($mset)}; my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)}; my ($min, $max, %seen); + my $upfx = $ctx->{-upfx} // ''; foreach my $m ($mset->items) { my $num = shift @nums; @@ -126,7 +133,7 @@ sub mset_summary { } my $date = fmt_ts($smsg->{ds}); $s = '(no subject)' if $s eq ''; - $$res .= qq{$rank. }. + $$res .= qq{$rank. }. $s . "\n"; $$res .= "$pfx - by $f @ $date UTC [$pct%]\n\n"; } @@ -305,7 +312,7 @@ sub mset_thread { my $skel = search_nav_bot($ctx, $mset, $q). "
-- links below jump to the message on this page --\n";
 
-	$ctx->{-upfx} = '';
+	$ctx->{-upfx} //= '';
 	$ctx->{anchor_idx} = 1;
 	$ctx->{cur_level} = 0;
 	$ctx->{skel} = \$skel;