X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/71d984b3109e7d5ab9e7e41bb50dc00a1787dd6f..532ec56a5f2131809f8a2709f2f1d5c1e5d0a19c:/IkiWiki/Plugin/map.pm?ds=inline diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index af08005b8..18c584a30 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -12,9 +12,18 @@ use strict; use IkiWiki 2.00; sub import { #{{{ + hook(type => "getsetup", id => "map", call => \&getsetup); hook(type => "preprocess", id => "map", call => \&preprocess); } # }}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, +} #}}} + sub preprocess (@) { #{{{ my %params=@_; $params{pages}="*" unless defined $params{pages}; @@ -26,11 +35,12 @@ sub preprocess (@) { #{{{ foreach my $page (keys %pagesources) { if (pagespec_match($page, $params{pages}, location => $params{page})) { if (exists $params{show} && + exists $pagestate{$page} && exists $pagestate{$page}{meta}{$params{show}}) { $mapitems{$page}=$pagestate{$page}{meta}{$params{show}}; } else { - $mapitems{$page}=$page; + $mapitems{$page}=''; } # Check for a common prefix. if (! defined $common_prefix) { @@ -58,8 +68,9 @@ sub preprocess (@) { #{{{ $common_prefix=IkiWiki::dirname($common_prefix); } - # Needs to update whenever a page is added or removed, so - # register a dependency. + # Needs to update whenever a page is added or removed (or in some + # cases, when its content changes, if show=title), so register a + # dependency. add_depends($params{page}, $params{pages}); # Explicitly add all currently shown pages, to detect when pages # are removed. @@ -69,23 +80,24 @@ sub preprocess (@) { #{{{ my $parent=""; my $indent=0; my $openli=0; - my $dummy=0; + my $addparent=""; my $map = "
\n\n"; } } - $dummy=0; while ($depth < $indent) { $indent--; $map .= "\n"; @@ -102,11 +114,12 @@ sub preprocess (@) { #{{{ $map .= "