From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 01784215F7 for ; Thu, 13 Oct 2016 03:59:04 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] thread: reduce indentation level Date: Thu, 13 Oct 2016 03:59:02 +0000 Message-Id: <20161013035903.1726-2-e@80x24.org> In-Reply-To: <20161013035903.1726-1-e@80x24.org> References: <20161013035903.1726-1-e@80x24.org> List-Id: This should reduce differences from the original Mail::Thread code and hopefully make things easier-to-follow. --- lib/PublicInbox/SearchThread.pm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/PublicInbox/SearchThread.pm b/lib/PublicInbox/SearchThread.pm index 003a8d1..c6bd999 100644 --- a/lib/PublicInbox/SearchThread.pm +++ b/lib/PublicInbox/SearchThread.pm @@ -49,27 +49,27 @@ sub _add_message ($$) { $this->{smsg} = $smsg; # B. For each element in the message's References field: + defined(my $refs = $smsg->{references}) or return; + my $prev; - if (defined(my $refs = $smsg->{references})) { - foreach my $ref ($refs =~ m/<([^>]+)>/g) { - # Find a Container object for the given Message-ID - my $cont = _get_cont_for_id($self, $ref); - - # Link the References field's Containers together in - # the order implied by the References header - # - # * If they are already linked don't change the - # existing links - # * Do not add a link if adding that link would - # introduce a loop... - if ($prev && - !$cont->{parent} && # already linked - !$cont->has_descendent($prev) # would loop - ) { - $prev->add_child($cont); - } - $prev = $cont; + foreach my $ref ($refs =~ m/<([^>]+)>/g) { + # Find a Container object for the given Message-ID + my $cont = _get_cont_for_id($self, $ref); + + # Link the References field's Containers together in + # the order implied by the References header + # + # * If they are already linked don't change the + # existing links + # * Do not add a link if adding that link would + # introduce a loop... + if ($prev && + !$cont->{parent} && # already linked + !$cont->has_descendent($prev) # would loop + ) { + $prev->add_child($cont); } + $prev = $cont; } # C. Set the parent of this message to be the last element in -- EW