Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 97450eb6dd988fbe2d04cf684528658406ca4ddb..b08d78d76dc6752ee37012bb3df707eba7faefc4 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -45,7 +45,8 @@ sub preprocess (@) { #{{{
        }
        
        # Common prefix should not be a page in the map.
        }
        
        # 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);
        }
 
                $common_prefix=IkiWiki::dirname($common_prefix);
        }
 


@@ -60,19 +61,23 @@ sub preprocess (@) { #{{{
        my $parent="";
        my $indent=0;
        my $openli=0;
        my $parent="";
        my $indent=0;
        my $openli=0;

+       my $dummy=0;

        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {
        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {

-               $item=~s/^\Q$common_prefix\E\/// if length $common_prefix;
+               $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);
                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";
                        }
                }
                        $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";


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

+                               $dummy=1;

                                $p.="/".shift(@bits);
                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage}, $p, class => "mapparent")
                                $p.="/".shift(@bits);
                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage}, $p, class => "mapparent")

-                                       ."</span>\n";
+                                       ."\n";

                                $openli=1;
                        }
                        else {
                                $openli=1;
                        }
                        else {


@@ -103,7 +109,7 @@ sub preprocess (@) { #{{{
                $map .= "<li>"
                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item, class => "mapitem")
                $map .= "<li>"
                        .htmllink($params{page}, $params{destpage}, 
                                "/".$common_prefix."/".$item, class => "mapitem")

-                       ."</span>\n";
+                       ."\n";

                $openli=1;
                $parent=$item;
        }
                $openli=1;
                $parent=$item;
        }