Merge commit 'smcv/prefix'

[git.ikiwiki.info.git] / IkiWiki / Plugin / graphviz.pm

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 5d666e1be68d854e8c4e00f96c627de699521859..b13d15fa6350aadd237494350dd1c8949bf72700 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
                # open2 doesn't respect "use open ':utf8'"
-               binmode (IN, ':utf8');
                binmode (OUT, ':utf8');
 
                print OUT $src;
@@ -56,7 +55,7 @@ sub render_graph (\%) { #{{{
 
                waitpid $pid, 0;
                $SIG{PIPE}="DEFAULT";
-               return  "[[graph ".gettext("failed to run graphviz")."]]" if ($sigpipe);
+               error gettext("failed to run graphviz") if $sigpipe;
 
                if (! $params{preview}) {
                        writefile($dest, $config{destdir}, $png, 1);
@@ -70,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{destpage})."\" />\n";
+       }
 } #}}}
 
 sub graph (@) { #{{{
@@ -78,7 +82,7 @@ sub graph (@) { #{{{
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};
        $params{prog} = "dot" unless defined $params{prog};
-       return "[[graph ".gettext("prog not a valid graphviz program")."]]" unless $graphviz_programs{$params{prog}};
+       error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
        return render_graph(%params);
 } # }}}