summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn23
-rw-r--r--doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn46
2 files changed, 48 insertions, 21 deletions
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
index c9f698158..bc80125ad 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
@@ -9,31 +9,12 @@ 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.
+(preview bug split to [[Problems_with_graphviz.pm_plug-in_previews]])
+
>> 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
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
new file mode 100644
index 000000000..3b77a48bb
--- /dev/null
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
@@ -0,0 +1,46 @@
+(split from [[Problems_with_graphviz.pm_plug-in]])
+
+[graphviz] 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, 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]]
+
+>>> Despite this patch I am still experiencing the problem. Normal page source for a graph contains:
+
+ &lt;div id="content"&gt;
+ &lt;p&gt;&lt;img src="./graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+
+ &lt;/div&gt;
+
+>>> preview contains
+
+ &lt;div id="preview"&gt;
+ &lt;p&gt;&lt;img src="./demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+
+ &lt;/div&gt;
+
+>>> I don't quite understand why, this makes sense from the CGI path (in my
+>>> case from the root of the site). The browsers appear to be trying to fetch
+>>> `/demo/diagrams/demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png`
+>>> (i.e., prepending the required relpath twice). -- [[Jon]]