web commit by JoshTriplett: Add shortcut for the Internet Archive.

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 0ae5c1002f11b6f44ef38100c1d70d926421ef61..3c41194f47f32cf51f782c72a1c74a085a98e21e 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Produce a hyerarchical map of links.
+# Produce a hierarchical map of links.
 #
 # by Alessandro Dotti Contra <alessandro@hyboria.org>
 #
@@ -12,8 +12,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "map",
-               call => \&preprocess);
+       hook(type => "preprocess", id => "map", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -22,12 +21,12 @@ sub preprocess (@) { #{{{
        
        # 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 = ();
-       foreach my $page (keys %IkiWiki::links) {
-               if (IkiWiki::pagespec_match($page, $params{pages})) {
+       foreach my $page (keys %links) {
+               if (pagespec_match($page, $params{pages}, $params{page})) {
                        push @mapitems, $page;
                }
        }
@@ -50,7 +49,7 @@ sub preprocess (@) { #{{{
                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"
-                       .IkiWiki::htmllink($params{page}, $params{destpage}, $item) ."\n";
+                       .htmllink($params{page}, $params{destpage}, $item) ."\n";
                $openli=1;
        }
        while ($indent > 0) {