Item10760: added branchfooter and branchheader parameters to the topi…

…crecurse macro git-svn-id: http://svn.foswiki.org/trunk/TopicRecursePlugin@11712 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 18, 2011 · 061c804 · 061c804
1 parent c0b63fa
commit 061c804
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/data/System/VarTOPICRECURSE.txt b/data/System/VarTOPICRECURSE.txt
@@ -14,6 +14,8 @@
      | =header="..."= %BR% \
        =footer="..."=                   | Custom format results: see [[FormattedSearch]] for usage &amp; examples | =*Search: '$rootquery'*$n= %BR% =*Total: $ntopics*= |
      | =format="..."= %BR% \
+     | =branchheader="..."= %BR% \
+       =branchfooter="..."=                   | Custom format results: see [[FormattedSearch]] for usage &amp; examples | |
        =formatbranch="..."= %BR% \
        =formatleaf="..."=               | Custom format results: see [[FormattedSearch]] for usage &amp; examples; "branch" format is for nodes which have descendents; "leaf" format is for terminating nodes for which there are no others below. | =$indent* [<nop>[$web.<nop>$topic][$topic]]= |
      | =separator="..."= | Separator _between_ search hits. See [[#FormatTokens]] | =$n= |

diff --git a/lib/Foswiki/Plugins/TopicRecursePlugin/Core.pm b/lib/Foswiki/Plugins/TopicRecursePlugin/Core.pm
@@ -62,7 +62,7 @@ sub TOPICRECURSE {
         writeDebug( "rootNode: $rootNode->{webtopic}", 'TOPICRECURSE', 4 );
         my $spec = extractParams(
             $params,
-            qw(header format formatbranch formatleaf separator footer),
+            qw(header format formatbranch formatleaf separator footer branchheader branchfooter),
             qw(nodelimit depthlimit breadthlimit)
         );
         my @renderednodes = formatNodes( $rootNode, $spec );
@@ -96,7 +96,7 @@ sub formatNodes {
         my $result = renderNode( $node, $spec->{formatbranch} );
 
         if ( not $node->isRoot() ) {
-            push( @renderednodes, $result );
+            push( @renderednodes, $spec->{branchheader}.$result.$spec->{branchfooter} );
         }
     }
     else {