X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/80d4d1d26de5da6416793a93d14c62d44ca064b2..2c310f8349182ca155a8cad1d8454f9937e87527:/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn?ds=sidebyside diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn index 1ec3e32bc..c9f698158 100644 --- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn +++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn @@ -9,25 +9,13 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which 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. -> You seem to be using an old version of ikiwiki, these preview isues have -> been fixed for some time, and the code doesn't look like what you patch -> in your second hunk. --[[Joey]] - ->> I have just tested ikiwiki-2.5. The code in question still looks ->> the same, and the patch is still needed for making the graphviz ->> plug-in work in preview mode here. - ->>> No, the relevant code is just above the bit you patched. Notice that in ->>> preview mode, it returns an img tag with the graphviz drawing embedded ->>> in it, using base64 encoding. Unless you can show me why that doesn't ->>> work, I still think this bug is done. --[[Joey]] - >> Here is an updated patch againt ikiwiki-2.5: +>>> [[Applied|done]], thanks. --[[Joey]] --- 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 - @@ -69,7 +69,12 @@ sub render_graph (\%) { #{{{ + @@ -69,7 +69,12 @@ sub render_graph (\%) { } } @@ -38,9 +26,9 @@ It also generates image URLs relative to the page being rendered, which means th + else { + return "\n"; + } - } #}}} + } - sub graph (@) { #{{{ + sub graph (@) { >> --[[HenrikBrixAndersen]] @@ -50,7 +38,7 @@ The patch below fixes these two issues. --- graphviz.pm.orig Thu Jun 7 15:45:16 2007 +++ graphviz.pm Fri Jun 8 12:03:38 2007 - @@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{ + @@ -41,7 +41,6 @@ sub render_graph (\%) { $pid=open2(*IN, *OUT, "$params{prog} -Tpng"); # open2 doesn't respect "use open ':utf8'" @@ -58,7 +46,7 @@ The patch below fixes these two issues. binmode (OUT, ':utf8'); print OUT $src; - @@ -70,7 +69,12 @@ sub render_graph (\%) { #{{{ + @@ -70,7 +69,12 @@ sub render_graph (\%) { } } @@ -69,6 +57,6 @@ The patch below fixes these two issues. + else { + return "\n"; + } - } #}}} + } - sub graph (@) { #{{{ + sub graph (@) {