X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/72ad3a5d3485d50484d2ce9e5eff96e0dbb19064..9dbbbd0efacb5acebaed2d0ee74d1c185b27394a:/IkiWiki/Plugin/linkmap.pm

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 2405cae7f..62984d9b8 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -3,14 +3,12 @@ package IkiWiki::Plugin::linkmap;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "linkmap",
-		call => \&preprocess);
-	IkiWiki::hook(type => "format", id => "linkmap",
-		call => \&format);
+	hook(type => "preprocess", id => "linkmap", call => \&preprocess);
+	hook(type => "format", id => "linkmap", call => \&format);
 } # }}}
 
 my $mapnum=0;
@@ -23,7 +21,7 @@ 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});
 	
 	# Can't just return the linkmap here, since the htmlscrubber
 	# scrubs out all <object> tags (with good reason!)
@@ -49,34 +47,25 @@ sub genmap ($) { #{{{
 
 	# Get all the items to map.
 	my %mapitems = ();
-	foreach my $item (keys %IkiWiki::links) {
-		if (IkiWiki::pagespec_match($item, $params{pages})) {
-			my $link=IkiWiki::htmlpage($item);
-			$link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
-			$mapitems{$item}=$link;
+	foreach my $item (keys %links) {
+		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.
-	IkiWiki::writefile("$params{page}.png", $IkiWiki::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 $tries=10;
 	my $pid;
-	while (1) {
-		eval {
-			$pid=open2(*IN, *OUT, "dot -Tpng -o '$IkiWiki::config{destdir}/$params{page}.png' -Tcmapx");
-		};
-		last unless $@;
-		$tries--;
-		if ($tries < 1) {
-			return "failed to run dot: $@";
-		}
-	}
+	my $sigpipe=0;
+	$SIG{PIPE}=sub { $sigpipe=1 };
+	$pid=open2(*IN, *OUT, "dot -Tpng -o '$config{destdir}/$dest' -Tcmapx");
+	
 	# open2 doesn't respect "use open ':utf8'"
 	binmode (IN, ':utf8'); 
 	binmode (OUT, ':utf8'); 
@@ -88,7 +77,7 @@ sub genmap ($) { #{{{
 		if defined $params{width} and defined $params{height};
 	foreach my $item (keys %mapitems) {
 		print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n";
-		foreach my $link (map { IkiWiki::bestlink($item, $_) } @{$IkiWiki::links{$item}}) {
+		foreach my $link (map { bestlink($item, $_) } @{$links{$item}}) {
 			print OUT "\"$item\" -> \"$link\";\n"
 				if $mapitems{$link};
 		}
@@ -97,13 +86,18 @@ sub genmap ($) { #{{{
 	close OUT;
 
 	local $/=undef;
-	my $ret="<object data=\"".
-	        IkiWiki::abs2rel("$params{page}.png", IkiWiki::dirname($params{page})).
-	        "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
-	         <IN>.
-	         "</object>";
+	my $ret="<object data=\"".urlto($dest, $params{page}).
+	       "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
+	        <IN>.
+	        "</object>";
 	close IN;
+	
 	waitpid $pid, 0;
+	$SIG{PIPE}="DEFAULT";
+	if ($sigpipe) {
+		return  "[[linkmap ".gettext("failed to run dot")."]]";
+	}
+
 	return $ret;
 } #}}}