$qh - search results

From 3979330907a90821283ac21bc00f0f6506e90383 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 31 Dec 2015 07:37:17 +0000 Subject: view: fixup indentation nesting in search Oops, the rarely-accessed threaded search view was completely broken. Additionally, the normal threading depths were broken when we attempted to go up-thread and replies got nested improperly Followup to commit be984ce279776d4513b4ca1bff05ebecafdd1bad ("view: thread using

! . qq{} . diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 20400470..fac0fcb1 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -176,7 +176,7 @@ sub emit_thread_html { seen => $seen, root_anchor => anchor_for($mid), anchor_idx => 0, - max_level => 0, + cur_level => 0, }; require PublicInbox::Git; @@ -187,9 +187,8 @@ sub emit_thread_html { } else { my $th = thread_results($msgs); thread_entry(\$cb, $git, $state, $_, 0) for $th->rootset; - if (my $max = $state->{max_level}) { - my $x = $max > 1 ? ('' x ($max-1)) : ''; - $cb->write($x . ''); + if (my $max = $state->{cur_level}) { + $cb->write(('' x ($max - 1)) . ''); } } $git = undef; @@ -638,25 +637,37 @@ sub ghost_parent { qq{[parent not found: <$html>]}; } -sub __thread_adj_level { - my ($cb, $state, $level) = @_; +sub thread_adj_level { + my ($fh, $state, $level) = @_; - return if $level <= 0; # flat output - my $max = $state->{max_level}; - if ($level > $max) { - $state->{max_level} = $level; - $$cb->write(($max ? '

' : ''). '

'); - } else { - $$cb->write('
'); + my $max = $state->{cur_level}; + if ($level <= 0) { + return '' if $max == 0; # flat output + + # reset existing lists + my $x = $max > 1 ? ('

' x ($max - 1)) : ''; + $fh->write($x . ''); + $state->{cur_level} = 0; + return ''; } + if ($level == $max) { # continue existing list + $fh->write('

'); + } elsif ($level < $max) { + my $x = $max > 1 ? ('

' x ($max - $level)) : ''; + $fh->write($x .= '

'); + $state->{cur_level} = $level; + } else { # ($level > $max) # start a new level + $state->{cur_level} = $level; + $fh->write(($max ? '

' : '') . '

'); + } + '

'. ghost_parent($upfx, $mid) .  '

'. ghost_parent($upfx, $mid) .  '