X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/930584cff747d87635da192585030d4fb30a2893..a605ee2c562323dc29852787c48a28bd03706718:/IkiWiki/Plugin/map.pm diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index b08d78d76..18c584a30 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -12,9 +12,18 @@ use strict; use IkiWiki 2.00; sub import { #{{{ + hook(type => "getsetup", id => "map", call => \&getsetup); hook(type => "preprocess", id => "map", call => \&preprocess); } # }}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, +} #}}} + sub preprocess (@) { #{{{ my %params=@_; $params{pages}="*" unless defined $params{pages}; @@ -25,8 +34,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 +52,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; } @@ -50,8 +68,9 @@ sub preprocess (@) { #{{{ $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. @@ -61,23 +80,24 @@ sub preprocess (@) { #{{{ my $parent=""; my $indent=0; my $openli=0; - my $dummy=0; + my $addparent=""; my $map = "