* Generalised preprocesser loop protection code.

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index f2e8722c8e9770ff43654881da8674b751d6040f..0ae5c1002f11b6f44ef38100c1d70d926421ef61 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -2,9 +2,9 @@
 #
 # Produce a hyerarchical map of links.
 #
 #
 # Produce a hyerarchical map of links.
 #

-# By Alessandro Dotti Contra <alessandro@hyboria.org>
+# by Alessandro Dotti Contra <alessandro@hyboria.org>

 #
 #

-# Revision: 0.1
+# Revision: 0.2

 package IkiWiki::Plugin::map;
 
 use warnings;
 package IkiWiki::Plugin::map;
 
 use warnings;


@@ -34,25 +34,30 @@ sub preprocess (@) { #{{{
 
        # Create the map.
        my $indent=0;
 
        # Create the map.
        my $indent=0;

+       my $openli=0;

        my $map = "<div class='map'>\n";
        my $map = "<div class='map'>\n";

+       $map .= "<ul>\n";

        foreach my $item (sort @mapitems) {
        foreach my $item (sort @mapitems) {

-               my $depth = ($item =~ tr/\//\//) + 1;
+               my $depth = ($item =~ tr/\//\//);

                while ($depth < $indent) {
                        $indent--;
                while ($depth < $indent) {
                        $indent--;

-                       $map.="</ul>\n";
+                       $map.="</li></ul>\n";

                }
                while ($depth > $indent) {
                        $indent++;
                        $map.="<ul>\n";
                }
                while ($depth > $indent) {
                        $indent++;
                        $map.="<ul>\n";

+                       $openli=0;

                }
                }

+               $map .= "</li>\n" if $openli;

                $map .= "<li>"
                $map .= "<li>"

-                       .IkiWiki::htmllink($params{page}, $params{destpage}, $item)
-                       ."</li>\n";
+                       .IkiWiki::htmllink($params{page}, $params{destpage}, $item) ."\n";
+               $openli=1;

        }
        while ($indent > 0) {
                $indent--;
        }
        while ($indent > 0) {
                $indent--;

-               $map.="</ul>\n";
+               $map.="</li></ul>\n";

        }
        }

+       $map .= "</li></ul>\n";

        $map .= "</div>\n";
        return $map;
 } # }}}
        $map .= "</div>\n";
        return $map;
 } # }}}