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.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 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 1D9401F8B5 for ; Thu, 20 Aug 2015 10:20:30 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/4] view: simplify message threading dumpers Date: Thu, 20 Aug 2015 10:20:27 +0000 Message-Id: <1440066029-7400-2-git-send-email-e@80x24.org> In-Reply-To: <1440066029-7400-1-git-send-email-e@80x24.org> References: <1440066029-7400-1-git-send-email-e@80x24.org> List-Id: --- lib/PublicInbox/View.pm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index e29922e..fe701b1 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -498,6 +498,7 @@ sub anchor_for { sub simple_dump { my ($dst, $root, $node, $level) = @_; + return unless $node; # $root = [ Root Message-ID, \%seen, $srch ]; if (my $x = $node->message) { my $mid = $x->header('Message-ID'); @@ -527,8 +528,8 @@ sub simple_dump { } } } - simple_dump($dst, $root, $node->child, $level + 1) if $node->child; - simple_dump($dst, $root, $node->next, $level) if $node->next; + simple_dump($dst, $root, $node->child, $level+1); + simple_dump($dst, $root, $node->next, $level); } sub thread_followups { @@ -553,6 +554,7 @@ sub thread_html_head { sub thread_entry { my ($dst, $git, $state, $node, $level) = @_; + return unless $node; # $state = [ $search_res, $seen, undef, 0 (msg_nr) ]; # $seen is overloaded with 3 types of fields: # 1) "root_anchor" => anchor_for(Message-ID), @@ -570,11 +572,8 @@ sub thread_entry { $$dst .= index_entry(undef, $mime, $level, $state); } } - my $cur; - $cur = $node->child and - thread_entry($dst, $git, $state, $cur, $level + 1); - $cur = $node->next and - thread_entry($dst, $git, $state, $cur, $level); + thread_entry($dst, $git, $state, $node->child, $level + 1); + thread_entry($dst, $git, $state, $node->next, $level); } sub load_results { -- EW