X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/069b10cc6a9714211fe7136ac6febf5c583e5549..3401dc6110ac785c1df3f447d2f1de017be92538:/IkiWiki/Plugin/map.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index f7ab291c7..826dbbd66 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -9,13 +9,22 @@ package IkiWiki::Plugin::map;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.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};
 	
@@ -23,31 +32,31 @@ sub preprocess (@) { #{{{
 
 	# Get all the items to map.
 	my %mapitems;
-	foreach my $page (keys %pagesources) {
-		if (pagespec_match($page, $params{pages}, location => $params{page})) {
-			if (exists $params{show} && 
-			    exists $pagestate{$page}{meta}{$params{show}}) {
-				$mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
-			}
-			else {
-				$mapitems{$page}=$page;
-			}
-			# Check for a common prefix.
-			if (! defined $common_prefix) {
-				$common_prefix=$page;
-			}
-			elsif (length $common_prefix &&
-			       $page !~ /^\Q$common_prefix\E(\/|$)/) {
-				my @a=split(/\//, $page);
-				my @b=split(/\//, $common_prefix);
-				$common_prefix="";
-				while (@a && @b && $a[0] eq $b[0]) {
-					if (length $common_prefix) {
-						$common_prefix.="/";
-					}
-					$common_prefix.=shift(@a);
-					shift @b;
+	foreach my $page (pagespec_match_list([keys %pagesources],
+				$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}='';
+		}
+		# Check for a common prefix.
+		if (! defined $common_prefix) {
+			$common_prefix=$page;
+		}
+		elsif (length $common_prefix &&
+		       $page !~ /^\Q$common_prefix\E(\/|$)/) {
+			my @a=split(/\//, $page);
+			my @b=split(/\//, $common_prefix);
+			$common_prefix="";
+			while (@a && @b && $a[0] eq $b[0]) {
+				if (length $common_prefix) {
+					$common_prefix.="/";
 				}
+				$common_prefix.=shift(@a);
+				shift @b;
 			}
 		}
 	}
@@ -70,23 +79,34 @@ sub preprocess (@) { #{{{
 	my $parent="";
 	my $indent=0;
 	my $openli=0;
-	my $dummy=0;
-	my $map = "<div class='map'>\n<ul>\n";
-	foreach my $item (sort { $mapitems{$a} cmp $mapitems{$b} } keys %mapitems) {
+	my $addparent="";
+	my $map = "<div class='map'>\n";
+
+	# Return empty div if %mapitems is empty
+	if (!scalar(keys %mapitems)) {
+		$map .= "</div>\n";
+		return $map; 
+	} 
+	else { # continue populating $map
+		$map .= "<ul>\n";
+	}
+
+	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";
@@ -103,11 +123,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;
@@ -120,7 +141,7 @@ sub preprocess (@) { #{{{
 		$map .= "<li>"
 			.htmllink($params{page}, $params{destpage}, 
 				"/".$common_prefix."/".$item,
-				linktext => $mapitems{$item},
+				@linktext,
 				class => "mapitem", noimageinline => 1)
 			."\n";
 		$openli=1;
@@ -132,6 +153,6 @@ sub preprocess (@) { #{{{
 	}
 	$map .= "</div>\n";
 	return $map;
-} # }}}
+}
 
 1