PyukiWiki CVS Commit
pyuki****@lists*****
2012年 6月 22日 (金) 06:42:42 JST
Index: PyukiWiki-Devel-UTF8/plugin/sitemap.inc.pl diff -u PyukiWiki-Devel-UTF8/plugin/sitemap.inc.pl:1.370 PyukiWiki-Devel-UTF8/plugin/sitemap.inc.pl:1.371 --- PyukiWiki-Devel-UTF8/plugin/sitemap.inc.pl:1.370 Thu Jun 21 18:58:16 2012 +++ PyukiWiki-Devel-UTF8/plugin/sitemap.inc.pl Fri Jun 22 06:42:42 2012 @@ -1,6 +1,6 @@ ###################################################################### # sitemap.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: sitemap.inc.pl,v 1.370 2012/06/21 09:58:16 papu Exp $ +# $Id: sitemap.inc.pl,v 1.371 2012/06/21 21:42:42 papu Exp $ # # "PyukiWiki" ver 0.2.1-alpha1-dev3 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -42,6 +42,9 @@ # ###################################################################### +$sitemap::noprefix=1 + if(!defined($::sitemap::noprefix)); + sub plugin_sitemap_convert { $::form{title}='no'; # $::form{ls2}='no'; @@ -93,7 +96,9 @@ foreach my $menu(@sitemap) { if($sitemap{$menu} ne '') { if($menu=~/$bracket_name/) { - $body.="<ul><li><strong>@{[&make_link($menu)]}</strong></li><ul>"; + if($menu!~/$::non_list/) { + $body.="<ul><li><strong>@{[&make_link(&plugin_sitemap_cutpage($menu))]}</strong></li><ul>"; + } } else { $body.="<ul><li><strong>$menu</strong></li><ul>"; } @@ -116,9 +121,9 @@ $view=1 if($page eq $_); } if($view eq 0) { - if(&is_readable($page) && &is_exist_page($page)) { + if(&is_readable($page) && &is_exist_page($page) && $page!~/$::non_list/) { push(@viewed,$page); - $body.="<li>" . &make_link_wikipage($page,$page); + $body.="<li>" . &make_link_wikipage($page,&plugin_sitemap_cutpage($page)); if($::form{subject}+0 eq 1) { $body.="<br>"; $body.=&plugin_sitemap_trim(&get_subjectline($page),60); @@ -209,6 +214,21 @@ $str=~s/\ \/\/\ \#.*//g; # debug return $str; } + +sub plugin_sitemap_cutpage { + my $str=shift; + + if($pathmenu::loaded eq 1) { + my $cutedpage=$str; + $cutedpage=~s/.*$::separator//g; + if($str eq $cutedpage) { + return $str; + } + return $cutedpage; + } + return $str; +} + 1; __END__ =head1 NAME
