updates for new regime

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

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 528d51697fa74e37f2fcefaa15113d94d40e6027..0a8d0ca9a1bfc20e84251638ae8628036bd20ee3 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -49,22 +49,22 @@ sub genmap ($) { #{{{
        my %mapitems = ();
        foreach my $item (keys %links) {
                if (pagespec_match($item, $params{pages}, $params{page})) {
-                       my $link=htmlpage($item);
-                       $link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
-                       $mapitems{$item}=$link;
+                       $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;;
        $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'); 
@@ -86,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>";
@@ -96,7 +95,7 @@ sub genmap ($) { #{{{
        waitpid $pid, 0;
        $SIG{PIPE}="DEFAULT";
        if ($sigpipe) {
-               return  "[[".gettext("linkmap failed to run dot")."]]";
+               return  "[[linkmap ".gettext("failed to run dot")."]]";
        }
 
        return $ret;