From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 21:52:20 +0000 (-0400)
Subject: map: switch to use_pagespec
X-Git-Tag: 3.20091017~27^2~66
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/de24c0df873a772a8b44098d1b4d2e1258640c9e?ds=inline;hp=--cc

map: switch to use_pagespec
---

de24c0df873a772a8b44098d1b4d2e1258640c9e
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 19872e51c..634b0e4d6 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -28,12 +28,15 @@ sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
+	# Needs to update whenever a page is added or removed (or in some
+	# cases, when its content changes, if show= is specified).
+	my $deptype=deptype(exists $params{show} ? "content" : "presence");
+	
 	my $common_prefix;
 
 	# Get all the items to map.
 	my %mapitems;
-	foreach my $page (pagespec_match_list([keys %pagesources],
-				$params{pages}, location => $params{page})) {
+	foreach my $page (use_pagespec($params{page}, $params{pages}, deptype => $deptype)) {
 		if (exists $params{show} && 
 		    exists $pagestate{$page} &&
 		    exists $pagestate{$page}{meta}{$params{show}}) {
@@ -67,12 +70,6 @@ sub preprocess (@) {
 		$common_prefix=IkiWiki::dirname($common_prefix);
 	}
 
-	# Needs to update whenever a page is added or removed (or in some
-	# cases, when its content changes, if show= is specified), so
-	# register a dependency.
-	add_depends($params{page}, $params{pages},
-		deptype(exists $params{show} ? "content" : "presence");
-
 	# Create the map.
 	my $parent="";
 	my $indent=0;
@@ -80,12 +77,12 @@ sub preprocess (@) {
 	my $addparent="";
 	my $map = "<div class='map'>\n";
 
-	# Return empty div if %mapitems is empty
-	if (!scalar(keys %mapitems)) {
+	if (! keys %mapitems) {
+		# return empty div for empty map
 		$map .= "</div>\n";
 		return $map; 
 	} 
-	else { # continue populating $map
+	else {
 		$map .= "<ul>\n";
 	}