X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/025cf0083ee2769345084e7f9a0ab475108c5c69..b72780e70b54bef4fd7fa52a3d2f221b9b4a46d4:/IkiWiki/Plugin/map.pm?ds=inline diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 27ae0c6a3..1194f6ed2 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -9,29 +9,31 @@ package IkiWiki::Plugin::map; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; sub import { #{{{ - IkiWiki::hook(type => "preprocess", id => "map", - call => \&preprocess); + hook(type => "preprocess", id => "map", call => \&preprocess); } # }}} sub preprocess (@) { #{{{ my %params=@_; $params{pages}="*" unless defined $params{pages}; - # Needs to update whenever a page is added or removed, so - # register a dependency. - IkiWiki::add_depends($params{page}, $params{pages}); - # Get all the items to map. my @mapitems = (); - foreach my $page (keys %IkiWiki::links) { - if (IkiWiki::pagespec_match($page, $params{pages})) { + foreach my $page (keys %pagesources) { + if (pagespec_match($page, $params{pages}, location => $params{page})) { push @mapitems, $page; } } + # Needs to update whenever a page is added or removed, so + # register a dependency. + add_depends($params{page}, $params{pages}); + # Explicitly add all currently shown pages, to detect when pages + # are removed. + add_depends($params{page}, join(" or ", @mapitems)); + # Create the map. my $indent=0; my $openli=0; @@ -50,7 +52,8 @@ sub preprocess (@) { #{{{ } $map .= "\n" if $openli; $map .= "