web commit from 83.222.23.243: poll vote (Accept only OpenID for logins)

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

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index c5055982935c3b9ab6a9357f8dd4a8264067a04e..62984d9b88b1082c8d40cca133ed8ae5174fb26f 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::linkmap;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
@@ -48,21 +48,23 @@ sub genmap ($) { #{{{
        # Get all the items to map.
        my %mapitems = ();
        foreach my $item (keys %links) {
-               if (pagespec_match($item, $params{pages}, $params{page})) {
+               if (pagespec_match($item, $params{pages}, location => $params{page})) {
                        $mapitems{$item}=urlto($item, $params{destpage});
                }
        }
 
+       my $dest=$params{page}."/linkmap.png";
+
        # Use ikiwiki's function to create the file, this makes sure needed
        # subdirs are there and does some sanity checking.
-       will_render($params{page}, $params{page}.".png");
-       writefile($params{page}.".png", $config{destdir}, "");
+       will_render($params{page}, $dest);
+       writefile($dest, $config{destdir}, "");
 
        # Run dot to create the graphic and get the map data.
        my $pid;
-       my $sigpipe=0;;
+       my $sigpipe=0;
        $SIG{PIPE}=sub { $sigpipe=1 };
-       $pid=open2(*IN, *OUT, "dot -Tpng -o '$config{destdir}/$params{page}.png' -Tcmapx");
+       $pid=open2(*IN, *OUT, "dot -Tpng -o '$config{destdir}/$dest' -Tcmapx");
        
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8'); 
@@ -84,8 +86,7 @@ sub genmap ($) { #{{{
        close OUT;
 
        local $/=undef;
-       my $ret="<object data=\"".
-              IkiWiki::abs2rel("$params{page}.png", IkiWiki::dirname($params{page})).
+       my $ret="<object data=\"".urlto($dest, $params{page}).
               "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
                <IN>.
                "</object>";