From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/7] view: remove upfx parameter from thread skeleton dump
Date: Tue, 21 Jun 2016 03:11:55 +0000 [thread overview]
Message-ID: <20160621031201.28089-2-e@80x24.org> (raw)
In-Reply-To: <20160621031201.28089-1-e@80x24.org>
This makes the string creation somewhat simpler hopefully
makes the code easier-to-reason with.
---
lib/PublicInbox/View.pm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index dfae44f..9095c50 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -383,9 +383,10 @@ sub thread_skel {
cur => $mid,
prev_attr => '',
prev_level => 0,
+ upfx => "$tpfx../",
};
for (thread_results(load_results($sres))->rootset) {
- skel_dump($dst, $state, $tpfx, $_, 0);
+ skel_dump($dst, $state, $_, 0);
}
$ctx->{next_msg} = $state->{next_msg};
$ctx->{parent_msg} = $parent;
@@ -663,7 +664,7 @@ sub _msg_date {
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
sub _skel_header {
- my ($dst, $state, $upfx, $hdr, $level) = @_;
+ my ($dst, $state, $hdr, $level) = @_;
my $cur = $state->{cur};
my $mid = mid_clean($hdr->header_raw('Message-ID'));
@@ -705,18 +706,18 @@ sub _skel_header {
$s = $s->as_html;
}
my $m = PublicInbox::Hval->new_msgid($mid);
- $m = $upfx . '../' . $m->as_href . '/';
+ $m = $state->{upfx} . $m->as_href . '/';
$$dst .= "$pfx<a\nhref=\"$m\">";
$$dst .= defined($s) ? "$s</a> $f\n" : "$f</a>\n";
}
sub skel_dump {
- my ($dst, $state, $upfx, $node, $level) = @_;
+ my ($dst, $state, $node, $level) = @_;
return unless $node;
if (my $mime = $node->message) {
my $hdr = $mime->header_obj;
my $mid = mid_clean($hdr->header_raw('Message-ID'));
- _skel_header($dst, $state, $upfx, $hdr, $level);
+ _skel_header($dst, $state, $hdr, $level);
} else {
my $mid = $node->messageid;
if ($mid eq 'subject dummy') {
@@ -725,13 +726,13 @@ sub skel_dump {
$$dst .= ' [not found] ';
$$dst .= indent_for($level) . th_pfx($level);
$mid = PublicInbox::Hval->new_msgid($mid);
- my $href = "$upfx../" . $mid->as_href . '/';
+ my $href = $state->{upfx} . $mid->as_href . '/';
my $html = $mid->as_html;
$$dst .= qq{<<a\nhref="$href">$html</a>>\n};
}
}
- skel_dump($dst, $state, $upfx, $node->child, $level+1);
- skel_dump($dst, $state, $upfx, $node->next, $level);
+ skel_dump($dst, $state, $node->child, $level+1);
+ skel_dump($dst, $state, $node->next, $level);
}
sub sort_ts {
next prev parent reply other threads:[~2016-06-21 3:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 3:11 [PATCH 0/7] www: avoid recursion for thread walking Eric Wong
2016-06-21 3:11 ` Eric Wong [this message]
2016-06-21 3:11 ` [PATCH 2/7] view: remove dst parameter from thread skeleton dump Eric Wong
2016-06-21 3:11 ` [PATCH 3/7] view: remove recursion " Eric Wong
2016-06-21 3:11 ` [PATCH 4/7] view: remove recursion from expanded thread view Eric Wong
2016-06-21 3:11 ` [PATCH 5/7] searchview: remove recursion from " Eric Wong
2016-06-21 3:12 ` [PATCH 6/7] view: avoid recursion in topic index Eric Wong
2016-06-21 3:12 ` [PATCH 7/7] view: common thread walking interface Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160621031201.28089-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).