X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d0b1b244281102a07f675880c401ca831ff113d4..de468ba12dfc0891145b3f8b432eb97b70b60c0c:/IkiWiki/Plugin/map.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 93ff3194a..5b6a843e7 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -25,8 +25,14 @@ sub preprocess (@) { #{{{ my %mapitems; foreach my $page (keys %pagesources) { if (pagespec_match($page, $params{pages}, location => $params{page})) { - $mapitems{$page}=1; - + 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; @@ -37,6 +43,9 @@ sub preprocess (@) { #{{{ 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; } @@ -45,12 +54,14 @@ sub preprocess (@) { #{{{ } # Common prefix should not be a page in the map. - while (length $common_prefix && exists $mapitems{$common_prefix}) { + while (defined $common_prefix && length $common_prefix && + exists $mapitems{$common_prefix}) { $common_prefix=IkiWiki::dirname($common_prefix); } - # Needs to update whenever a page is added or removed, so - # register a dependency. + # Needs to update whenever a page is added or removed (or in some + # cases, when its content changes, if show=title), so register a + # dependency. add_depends($params{page}, $params{pages}); # Explicitly add all currently shown pages, to detect when pages # are removed. @@ -60,19 +71,24 @@ sub preprocess (@) { #{{{ my $parent=""; my $indent=0; my $openli=0; + my $dummy=0; my $map = "