From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, T_RP_MATCHES_RCVD shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 244F21FD2B for ; Wed, 2 Sep 2015 06:59:42 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/7] view: simplify parent anchoring code Date: Wed, 2 Sep 2015 06:59:36 +0000 Message-Id: <1441177179-16628-5-git-send-email-e@80x24.org> In-Reply-To: <1441177179-16628-1-git-send-email-e@80x24.org> References: <1441177179-16628-1-git-send-email-e@80x24.org> List-Id: This will make things easier for the next commit to pre-populate the `$seen' hash for linking within the flat view of a thread. --- lib/PublicInbox/View.pm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index d213124..0331b62 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -74,7 +74,7 @@ sub index_entry { my $mid_raw = $header_obj->header('Message-ID'); my $id = anchor_for($mid_raw); my $seen = $state->{seen}; - $seen->{$id} = "#$id"; # save the anchor for later + $seen->{$id} = "#$id"; # save the anchor for children, later my $mid = PublicInbox::Hval->new_msgid($mid_raw); my $from = PublicInbox::Hval->new_oneline($mime->header('From'))->raw; @@ -88,12 +88,8 @@ sub index_entry { my $path = $root_anchor ? '../../' : ''; my $href = $mid->as_href; my $irt = in_reply_to($header_obj); + my $parent_anchor = $seen->{anchor_for($irt)} if defined $irt; - my ($anchor_idx, $anchor); - if (defined $irt) { - $anchor_idx = anchor_for($irt); - $anchor = $seen->{$anchor_idx}; - } if ($srch) { my $t = $ctx->{flat} ? 'T' : 't'; $subj = "$subj"; @@ -135,13 +131,12 @@ sub index_entry { $rv .= html_footer($mime, 0, undef, $ctx); if (defined $irt) { - unless (defined $anchor) { + unless (defined $parent_anchor) { my $v = PublicInbox::Hval->new_msgid($irt); $v = $v->as_href; - $anchor = "${path}$v/"; - $seen->{$anchor_idx} = $anchor; + $parent_anchor = "${path}$v/"; } - $rv .= " parent"; + $rv .= " parent"; } if ($srch) { if ($ctx->{flat}) { -- EW