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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index f2e8722c8..1194f6ed2 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -1,58 +1,66 @@
 #!/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.1
+# 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;
 	my $map = "<div class='map'>\n";
+	$map .= "<ul>\n";
 	foreach my $item (sort @mapitems) {
-		my $depth = ($item =~ tr/\//\//) + 1;
+		my $depth = ($item =~ tr/\//\//);
 		while ($depth < $indent) {
 			$indent--;
-			$map.="</ul>\n";
+			$map.="</li></ul>\n";
 		}
 		while ($depth > $indent) {
 			$indent++;
 			$map.="<ul>\n";
+			$openli=0;
 		}
+		$map .= "</li>\n" if $openli;
 		$map .= "<li>"
-		        .IkiWiki::htmllink($params{page}, $params{destpage}, $item)
-			."</li>\n";
+			.htmllink($params{page}, $params{destpage}, $item)
+			."\n";
+		$openli=1;
 	}
 	while ($indent > 0) {
 		$indent--;
-		$map.="</ul>\n";
+		$map.="</li></ul>\n";
 	}
+	$map .= "</li></ul>\n";
 	$map .= "</div>\n";
 	return $map;
 } # }}}