map: switch to use_pagespec

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 19872e51cafe24973ee98217c06050b463715b41..634b0e4d6794a2d52179f561d26f8ea4bb8ac0cc 100644 (file)
--- 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";
        }