Merge commit 'smcv/comments'

[git.ikiwiki.info.git] / IkiWiki / Plugin / map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 5b6a843e7ae2680d654317fc35368190c2d9d087..af14ef5dee9cd6b33e127794c9bf7be7ee80bd91 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -11,11 +11,20 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
 use strict;
 use IkiWiki 2.00;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "map", call => \&getsetup);

        hook(type => "preprocess", id => "map", call => \&preprocess);
        hook(type => "preprocess", id => "map", call => \&preprocess);

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        


@@ -71,7 +80,7 @@ sub preprocess (@) { #{{{
        my $parent="";
        my $indent=0;
        my $openli=0;
        my $parent="";
        my $indent=0;
        my $openli=0;

-       my $dummy=0;
+       my $addparent="";

        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {
                my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {
                my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());


@@ -81,14 +90,14 @@ sub preprocess (@) { #{{{
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);
                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(\/|$)/;
+                       last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
+                       $addparent="";

                        $indent--;
                        $map .= "</li>\n";
                        if ($indent > 0) {
                                $map .= "</ul>\n";
                        }
                }
                        $indent--;
                        $map .= "</li>\n";
                        if ($indent > 0) {
                                $map .= "</ul>\n";
                        }
                }

-               $dummy=0;

                while ($depth < $indent) {
                        $indent--;
                        $map .= "</li>\n";
                while ($depth < $indent) {
                        $indent--;
                        $map .= "</li>\n";


@@ -105,11 +114,12 @@ sub preprocess (@) { #{{{
                                $map .= "<ul>\n";
                        }
                        if ($depth > $indent) {
                                $map .= "<ul>\n";
                        }
                        if ($depth > $indent) {

-                               $dummy=1;

                                $p.="/".shift(@bits);
                                $p.="/".shift(@bits);

+                               $addparent=$p;
+                               $addparent=~s/^\///;

                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage},
                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage},

-                                                $p, class => "mapparent",
+                                                "/".$common_prefix.$p, class => "mapparent",

                                                 noimageinline => 1)
                                        ."\n";
                                $openli=1;
                                                 noimageinline => 1)
                                        ."\n";
                                $openli=1;


@@ -134,6 +144,6 @@ sub preprocess (@) { #{{{
        }
        $map .= "</div>\n";
        return $map;
        }
        $map .= "</div>\n";
        return $map;

-} # }}}
+}

 
 1
 
 1