svn commit: r1566794 - /myfaces/site/cms-site/trunk/lib/view.pm

[lu...@apache.org]

Author: lu4242
Date: Mon Feb 10 22:52:25 2014
New Revision: 1566794

URL: http://svn.apache.org/r1566794
Log:
test how to fix documentation

Modified:
    myfaces/site/cms-site/trunk/lib/view.pm

Modified: myfaces/site/cms-site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/myfaces/site/cms-site/trunk/lib/view.pm?rev=1566794&r1=1566793&r2=1566794&view=diff
==============================================================================
--- myfaces/site/cms-site/trunk/lib/view.pm (original)
+++ myfaces/site/cms-site/trunk/lib/view.pm Mon Feb 10 22:52:25 2014
@@ -67,7 +67,7 @@ sub single_narrative {
                  if (!(-d "content$basePath/")){
                      $basePath = "$ptdir";
                  }
-                 $args{$headerKey} = pagetree("content$basePath/", $basePath, 0);
+                 $args{$headerKey} = pagetree("content$basePath/", $basePath, 1);
             }
             if ($command = "pagetree(2)") {
                  my($ptfile, $ptdir, $ptext) = fileparse($args{path}, qr/\.[^.]*/);
@@ -187,7 +187,7 @@ sub sitemap {
    $tdir =~ s{/\z}{};
 
    my $sitemap = "<ul>\n";
-   $sitemap = sitemapRender($sitemap, $entries, "$tdir");
+   $sitemap = sitemapRender($sitemap, $entries, "$tdir", -1);
    $sitemap .= "</ul>\n";
    $args{sitemap} = $sitemap;
    
@@ -251,7 +251,7 @@ sub sitemapFind {
 }
 
 sub sitemapRender {
-   my ($sitemap, $dir, $path) = @_;
+   my ($sitemap, $dir, $path, $level) = @_;
    my %entries = %{$dir->{"entries"}};
 
    foreach my $e (sort keys %entries) {
@@ -267,11 +267,11 @@ sub sitemapRender {
       }
 
       $sitemap .= "<li><a href=\"$path/$fn\">".$title."</a>";
-      if($entries{$e}->{entries}) {
+      if($entries{$e}->{entries} && ($level <= -1 || $level > 0)) {
          my $parent = $e;
          $parent =~ s/\.mdtext$//;
          $sitemap .= "<ul>\n";
-         $sitemap = sitemapRender($sitemap, $entries{$e}, "$path/$parent");
+         $sitemap = sitemapRender($sitemap, $entries{$e}, "$path/$parent", $level-1);
          $sitemap .= "</ul>\n";
       }
       $sitemap .= "</li>\n";
@@ -367,7 +367,7 @@ sub pagetree {
    sitemapFind($dir, $entries, $level);
 
    my $sitemap = "<ul>\n";
-   $sitemap = sitemapRender($sitemap, $entries, $webDir);
+   $sitemap = sitemapRender($sitemap, $entries, $webDir, $level);
    $sitemap .= "</ul>\n";
    
    return $sitemap;