use same logic as for regular discussion links

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index c65e61ac9214205aed98d5bfc280db505a7b6683..96daf39fcdf9debd255eec245bba57d1432747fc 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 #
 #!/usr/bin/perl
 #

-# Produce a hyerarchical map of links.
+# Produce a hierarchical 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;


@@ -12,8 +12,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
 use IkiWiki;
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "map",
-               call => \&preprocess);
+       hook(type => "preprocess", id => "map", call => \&preprocess);

 } # }}}
 
 sub preprocess (@) { #{{{
 } # }}}
 
 sub preprocess (@) { #{{{


@@ -22,38 +21,42 @@ sub preprocess (@) { #{{{
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.

-       IkiWiki::add_depends($params{page}, $params{pages});
+       add_depends($params{page}, $params{pages});

        
        # Get all the items to map.
        my @mapitems = ();
        
        # Get all the items to map.
        my @mapitems = ();

-       foreach my $page (keys %IkiWiki::links) {
-               if (IkiWiki::pagespec_match($page, $params{pages})) {
+       foreach my $page (keys %links) {
+               if (pagespec_match($page, $params{pages})) {

                        push @mapitems, $page;
                }
        }
 
        # Create the map.
        my $indent=0;
                        push @mapitems, $page;
                }
        }
 
        # 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;
-               next if exists $params{maxdepth} && $depth > $params{maxdepth};
+               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";
+                       .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;
 } # }}}