switch preprocess hooks to use error function

[ikiwiki.git] / IkiWiki / Plugin / linkmap.pm

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 5b87277ac1982f0dd73d5f4f06ad881e31d2c7f5..ab199b7238511b74b36255363809d902ef773eb9 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -53,11 +53,11 @@ sub genmap ($) { #{{{
                }
        }
 
                }
        }
 

-       my $dest=$params{destpage}."/linkmap.png";
+       my $dest=$params{page}."/linkmap.png";

 
        # Use ikiwiki's function to create the file, this makes sure needed
        # subdirs are there and does some sanity checking.
 
        # Use ikiwiki's function to create the file, this makes sure needed
        # subdirs are there and does some sanity checking.

-       will_render($params{destpage}, $dest);
+       will_render($params{page}, $dest);

        writefile($dest, $config{destdir}, "");
 
        # Run dot to create the graphic and get the map data.
        writefile($dest, $config{destdir}, "");
 
        # Run dot to create the graphic and get the map data.


@@ -86,7 +86,7 @@ sub genmap ($) { #{{{
        close OUT;
 
        local $/=undef;
        close OUT;
 
        local $/=undef;

-       my $ret="<object data=\"".urlto($dest, $params{page}).
+       my $ret="<object data=\"".urlto($dest, $params{destpage}).

               "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
                <IN>.
                "</object>";
               "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
                <IN>.
                "</object>";


@@ -94,9 +94,7 @@ sub genmap ($) { #{{{
        
        waitpid $pid, 0;
        $SIG{PIPE}="DEFAULT";
        
        waitpid $pid, 0;
        $SIG{PIPE}="DEFAULT";

-       if ($sigpipe) {
-               return  "[[linkmap ".gettext("failed to run dot")."]]";
-       }
+       error gettext("failed to run dot") if $sigpipe;

 
        return $ret;
 } #}}}
 
        return $ret;
 } #}}}