Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / bugs / Problems_with_graphviz.pm_plug-in.mdwn

diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
index 395427b8698f87142cf6b79325a372d140f44789..9a26e505af2df9f4b9a0dd47e5d57c4da31a76f8 100644 (file)
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
@@ -3,12 +3,41 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which
     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.
 
     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.
 

+> Ok, will remove the binmode IN then. done --[[Joey]]
+
+>> Thanks --[[HenrikBrixAndersen]]
+

 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.
 
 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.
 

+>> 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 (\%) { #{{{
+               }
+       }
+     
+    -  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";
+    +  }
+     } #}}}
+     
+     sub graph (@) { #{{{
+
+
+>> --[[HenrikBrixAndersen]]
+
+

 The patch below fixes these two issues.
 
     --- graphviz.pm.orig       Thu Jun  7 15:45:16 2007
 The patch below fixes these two issues.
 
     --- graphviz.pm.orig       Thu Jun  7 15:45:16 2007

-    +++ graphviz.pm    Thu Jun  7 15:52:27 2007
+    +++ graphviz.pm    Fri Jun  8 12:03:38 2007

     @@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
      
     @@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
      


@@ -17,12 +46,17 @@ The patch below fixes these two issues.
                binmode (OUT, ':utf8');
      
                print OUT $src;
                binmode (OUT, ':utf8');
      
                print OUT $src;

-    @@ -70,7 +69,7 @@ sub render_graph (\%) { #{{{
+    @@ -70,7 +69,12 @@ sub render_graph (\%) { #{{{

                }
        }
      
     -  return "<img src=\"".urlto($dest, $params{page})."\" />\n";
                }
        }
      
     -  return "<img src=\"".urlto($dest, $params{page})."\" />\n";

-    +  return "<img src=\"".urlto($dest, "/")."\" />\n";
+    +  if ($params{preview}) {
+    +          return "<img src=\"".urlto($dest, "")."\" />\n";
+    +  }
+    +  else {
+    +          return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+    +  }

      } #}}}
      
      } #}}}
      

-     sub graph (@) { #{{{
\ No newline at end of file
+     sub graph (@) { #{{{