X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/eea9f5053a36e178d35479501dda13d0dcd3a535..6cc5d22071f7dd8910fadba6b6349d70a7875bf6:/IkiWiki/Plugin/map.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 070f49415..1194f6ed2 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -1,37 +1,39 @@
 #!/usr/bin/perl
 #
-# Produce a hyerarchical map of links.
+# Produce a hierarchical map of links.
 #
-# By Alessandro Dotti Contra <alessandro@hyboria.org>
+# by Alessandro Dotti Contra <alessandro@hyboria.org>
 #
 # Revision: 0.2
 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 .= "</li>\n" if $openli;
 		$map .= "<li>"
-		        .IkiWiki::htmllink($params{page}, $params{destpage}, $item) ."\n";
+			.htmllink($params{page}, $params{destpage}, $item)
+			."\n";
 		$openli=1;
 	}
 	while ($indent > 0) {