2007-06-07 16:03:00 +02:00
The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which sometimes fail with a message similar to the following (depending on the input):
utf8 "\x89" does not map to Unicode at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 53, <IN> chunk 1.
Wide character in subroutine entry at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 68.
2007-07-28 22:58:01 +02:00
> Ok, will remove the binmode IN then. done --[[Joey]]
2007-07-25 04:15:52 +02:00
2007-07-27 11:45:27 +02:00
>> Thanks --[[HenrikBrixAndersen]]
2007-06-07 16:03:00 +02:00
It also generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
2007-07-27 11:45:27 +02:00
>> Here is an updated patch againt ikiwiki-2.5:
2007-07-30 00:34:42 +02:00
>>> [[Applied|done]], thanks. --[[Joey]]
2007-07-27 11:45:27 +02:00
--- IkiWiki/Plugin/graphviz.pm.orig 2007-07-27 11:35:05.000000000 +0200
+++ IkiWiki/Plugin/graphviz.pm 2007-07-27 11:36:02.000000000 +0200
2008-12-17 21:22:16 +01:00
@@ -69,7 +69,12 @@ sub render_graph (\%) {
2007-07-27 11:45:27 +02:00
}
}
- return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+ if ($params{preview}) {
+ return "<img src=\"".urlto($dest, "")."\" />\n";
+ }
+ else {
+ return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+ }
2008-12-17 21:22:16 +01:00
}
2007-07-27 11:45:27 +02:00
2008-12-17 21:22:16 +01:00
sub graph (@) {
2007-07-27 11:45:27 +02:00
>> --[[HenrikBrixAndersen]]
2007-06-07 16:03:00 +02:00
The patch below fixes these two issues.
--- graphviz.pm.orig Thu Jun 7 15:45:16 2007
2007-06-08 12:06:21 +02:00
+++ graphviz.pm Fri Jun 8 12:03:38 2007
2008-12-17 21:22:16 +01:00
@@ -41,7 +41,6 @@ sub render_graph (\%) {
2007-06-07 16:03:00 +02:00
$pid=open2(*IN, *OUT, "$params{prog} -Tpng");
# open2 doesn't respect "use open ':utf8'"
- binmode (IN, ':utf8');
binmode (OUT, ':utf8');
print OUT $src;
2008-12-17 21:22:16 +01:00
@@ -70,7 +69,12 @@ sub render_graph (\%) {
2007-06-07 16:03:00 +02:00
}
}
- return "<img src=\"".urlto($dest, $params{page})."\" />\n";
2007-06-08 12:06:21 +02:00
+ if ($params{preview}) {
+ return "<img src=\"".urlto($dest, "")."\" />\n";
+ }
+ else {
+ return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+ }
2008-12-17 21:22:16 +01:00
}
2007-06-07 16:03:00 +02:00
2008-12-17 21:22:16 +01:00
sub graph (@) {