aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-10-08 17:52:20 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-10-08 17:53:45 -0400
commitde24c0df873a772a8b44098d1b4d2e1258640c9e (patch)
tree5b56066688b6bba703a2722aa5924a2e14582023 /IkiWiki
parent5e236f5d25b68f5fb4a421b24470419c6042cb1c (diff)
downloadikiwiki-de24c0df873a772a8b44098d1b4d2e1258640c9e.tar
ikiwiki-de24c0df873a772a8b44098d1b4d2e1258640c9e.tar.gz
map: switch to use_pagespec
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/map.pm19
1 files changed, 8 insertions, 11 deletions
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";
}