X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0935e380c57b3c7e0cf3ecae587cca945f4eceb3..d40b2751151397344ed1a55a3e97ecdc0cecd56d:/IkiWiki/Plugin/map.pm diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 8037db773..581ae5011 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -19,48 +19,110 @@ sub preprocess (@) { #{{{ my %params=@_; $params{pages}="*" unless defined $params{pages}; + my $common_prefix; + # Get all the items to map. - my @mapitems = (); + 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 ", @mapitems)); + add_depends($params{page}, join(" or ", keys %mapitems)); # Create the map. + my $parent=""; my $indent=0; my $openli=0; - my $map = "<div class='map'>\n"; - $map .= "<ul>\n"; - foreach my $item (sort @mapitems) { - my $depth = ($item =~ tr/\//\//); + my $dummy=0; + my $map = "<div class='map'>\n<ul>\n"; + foreach my $item (sort keys %mapitems) { + $item=~s/^\Q$common_prefix\E\/// + if defined $common_prefix && length $common_prefix; + my $depth = ($item =~ tr/\//\//) + 1; + my $baseitem=IkiWiki::dirname($item); + while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) { + $parent=IkiWiki::dirname($parent); + last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/; + $indent--; + $map .= "</li>\n"; + if ($indent > 0) { + $map .= "</ul>\n"; + } + } + $dummy=0; while ($depth < $indent) { $indent--; - $map.="</li></ul>\n"; + $map .= "</li>\n"; + if ($indent > 0) { + $map .= "</ul>\n"; + } } + my @bits=split("/", $item); + my $p=""; + $p.="/".shift(@bits) for 1..$indent; while ($depth > $indent) { $indent++; - $map.="<ul>\n"; - $openli=0; + if ($indent > 1) { + $map .= "<ul>\n"; + } + if ($depth > $indent) { + $dummy=1; + $p.="/".shift(@bits); + $map .= "<li>" + .htmllink($params{page}, $params{destpage}, + $p, class => "mapparent", + noimageinline => 1) + ."\n"; + $openli=1; + } + else { + $openli=0; + } } $map .= "</li>\n" if $openli; $map .= "<li>" - .htmllink($params{page}, $params{destpage}, $item) + .htmllink($params{page}, $params{destpage}, + "/".$common_prefix."/".$item, + class => "mapitem", noimageinline => 1) ."\n"; $openli=1; + $parent=$item; } while ($indent > 0) { $indent--; - $map.="</li></ul>\n"; + $map .= "</li>\n</ul>\n"; } - $map .= "</li></ul>\n"; $map .= "</div>\n"; return $map; } # }}}