X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/71d984b3109e7d5ab9e7e41bb50dc00a1787dd6f..b39a76849d3c90ffc68627d1d6fe6cb5a821b215:/IkiWiki/Plugin/map.pm

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 = "<div class='map'>\n<ul>\n";
-	foreach my $item (sort { $mapitems{$a} cmp $mapitems{$b} } keys %mapitems) {
+	foreach my $item (sort keys %mapitems) {
+		my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
 		$item=~s/^\Q$common_prefix\E\///
 			if defined $common_prefix && length $common_prefix;
 		my $depth = ($item =~ tr/\//\//) + 1;
 		my $baseitem=IkiWiki::dirname($item);
 		while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
 			$parent=IkiWiki::dirname($parent);
-			last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;
+			last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
+			$addparent="";
 			$indent--;
 			$map .= "</li>\n";
 			if ($indent > 0) {
 				$map .= "</ul>\n";
 			}
 		}
-		$dummy=0;
 		while ($depth < $indent) {
 			$indent--;
 			$map .= "</li>\n";
@@ -102,11 +114,12 @@ sub preprocess (@) { #{{{
 				$map .= "<ul>\n";
 			}
 			if ($depth > $indent) {
-				$dummy=1;
 				$p.="/".shift(@bits);
+				$addparent=$p;
+				$addparent=~s/^\///;
 				$map .= "<li>"
 					.htmllink($params{page}, $params{destpage},
-						 $p, class => "mapparent",
+						 "/".$common_prefix.$p, class => "mapparent",
 						 noimageinline => 1)
 					."\n";
 				$openli=1;
@@ -119,7 +132,7 @@ sub preprocess (@) { #{{{
 		$map .= "<li>"
 			.htmllink($params{page}, $params{destpage}, 
 				"/".$common_prefix."/".$item,
-				linktext => $mapitems{$item},
+				@linktext,
 				class => "mapitem", noimageinline => 1)
 			."\n";
 		$openli=1;