X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..6fc66f83deba6df8abdf4bc117f8da7efbd7cbc1:/IkiWiki/Plugin/linkmap.pm?ds=inline

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 6b1609744..528d51697 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -48,7 +48,7 @@ sub genmap ($) { #{{{
 	# Get all the items to map.
 	my %mapitems = ();
 	foreach my $item (keys %links) {
-		if (pagespec_match($item, $params{pages})) {
+		if (pagespec_match($item, $params{pages}, $params{page})) {
 			my $link=htmlpage($item);
 			$link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
 			$mapitems{$item}=$link;
@@ -57,24 +57,15 @@ sub genmap ($) { #{{{
 
 	# 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}, $params{page}.".png");
+	writefile($params{page}.".png", $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 '$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}/$params{page}.png' -Tcmapx");
+	
 	# open2 doesn't respect "use open ':utf8'"
 	binmode (IN, ':utf8'); 
 	binmode (OUT, ':utf8'); 
@@ -96,12 +87,18 @@ sub genmap ($) { #{{{
 
 	local $/=undef;
 	my $ret="<object data=\"".
-	        IkiWiki::abs2rel("$params{page}.png", IkiWiki::dirname($params{page})).
-	        "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
-	         <IN>.
-	         "</object>";
+	       IkiWiki::abs2rel("$params{page}.png", IkiWiki::dirname($params{page})).
+	       "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
+	        <IN>.
+	        "</object>";
 	close IN;
+	
 	waitpid $pid, 0;
+	$SIG{PIPE}="DEFAULT";
+	if ($sigpipe) {
+		return  "[[".gettext("linkmap failed to run dot")."]]";
+	}
+
 	return $ret;
 } #}}}