X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ee1ad53c4c2710aa7ded61bdc56f3a8cce514f22..b2dea99417ebfee3d448ab6b49ca58cb2780258d:/IkiWiki/Plugin/map.pm diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 5aa2852de..581ae5011 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -19,45 +19,110 @@ sub preprocess (@) { #{{{ my %params=@_; $params{pages}="*" unless defined $params{pages}; - # Needs to update whenever a page is added or removed, so - # register a dependency. - add_depends($params{page}, $params{pages}); - + my $common_prefix; + # Get all the items to map. - my @mapitems = (); - foreach my $page (keys %links) { + my %mapitems; + foreach my $page (keys %pagesources) { if (pagespec_match($page, $params{pages}, location => $params{page})) { - push @mapitems, $page; + $mapitems{$page}=1; + + # Check for a common prefix. + if (! defined $common_prefix) { + $common_prefix=$page; + } + elsif (length $common_prefix && + $page !~ /^\Q$common_prefix\E(\/|$)/) { + my @a=split(/\//, $page); + 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; + } + } } } + + # Common prefix should not be a page in the map. + 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. + add_depends($params{page}, $params{pages}); + # Explicitly add all currently shown pages, to detect when pages + # are removed. + add_depends($params{page}, join(" or ", keys %mapitems)); # Create the map. + my $parent=""; my $indent=0; my $openli=0; - my $map = "