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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 22f75b9e5..af14ef5de 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -11,11 +11,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "map", call => \&getsetup);
 	hook(type => "preprocess", id => "map", call => \&preprocess);
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
@@ -31,7 +40,7 @@ sub preprocess (@) { #{{{
 				$mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
 			}
 			else {
-				$mapitems{$page}=$page;
+				$mapitems{$page}='';
 			}
 			# Check for a common prefix.
 			if (! defined $common_prefix) {
@@ -71,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";
@@ -104,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;
@@ -121,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;
@@ -133,6 +144,6 @@ sub preprocess (@) { #{{{
 	}
 	$map .= "</div>\n";
 	return $map;
-} # }}}
+}
 
 1