X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9f45c3080e893174751b9a4b7fe3e59da611a2ec..57ff2ecaeddb3e802fbec50acd7bf286941ec000:/IkiWiki/Plugin/linkmap.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 497b1ef43..62984d9b8 100644
--- 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,25 +48,23 @@ sub genmap ($) { #{{{
 	# Get all the items to map.
 	my %mapitems = ();
 	foreach my $item (keys %links) {
-		if (pagespec_match($item, $params{pages})) {
-			my $link=htmlpage($item);
-			$link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
-			$mapitems{$item}=$link;
+		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.
-	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.
-	# TODO: should really add the png to renderedfiles and call
-	# check_overwrite, but currently renderedfiles
-	# only supports listing one file per page.
 	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'); 
@@ -88,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>";
@@ -98,7 +95,7 @@ sub genmap ($) { #{{{
 	waitpid $pid, 0;
 	$SIG{PIPE}="DEFAULT";
 	if ($sigpipe) {
-		return  "[[linkmap failed to run dot]]";
+		return  "[[linkmap ".gettext("failed to run dot")."]]";
 	}
 
 	return $ret;