* Fix the template, toggle, and conditional plugins to filter text before

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

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 497b1ef43485dbdd4cb77043072f42c4a3b2898e..528d51697fa74e37f2fcefaa15113d94d40e6027 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -48,7 +48,7 @@ sub genmap ($) { #{{{
        # Get all the items to map.
        my %mapitems = ();
        foreach my $item (keys %links) {
        # Get all the items to map.
        my %mapitems = ();
        foreach my $item (keys %links) {

-               if (pagespec_match($item, $params{pages})) {
+               if (pagespec_match($item, $params{pages}, $params{page})) {

                        my $link=htmlpage($item);
                        $link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
                        $mapitems{$item}=$link;
                        my $link=htmlpage($item);
                        $link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
                        $mapitems{$item}=$link;


@@ -57,12 +57,10 @@ sub genmap ($) { #{{{
 
        # 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.

-       writefile("$params{page}.png", $config{destdir}, "");
+       will_render($params{page}, $params{page}.".png");
+       writefile($params{page}.".png", $config{destdir}, "");

 
        # Run dot to create the graphic and get the map data.
 
        # Run dot to create the graphic and get the map data.

-       # TODO: should really add the png to renderedfiles and call
-       # check_overwrite, but currently renderedfiles
-       # only supports listing one file per page.

        my $pid;
        my $sigpipe=0;;
        $SIG{PIPE}=sub { $sigpipe=1 };
        my $pid;
        my $sigpipe=0;;
        $SIG{PIPE}=sub { $sigpipe=1 };


@@ -98,7 +96,7 @@ sub genmap ($) { #{{{
        waitpid $pid, 0;
        $SIG{PIPE}="DEFAULT";
        if ($sigpipe) {
        waitpid $pid, 0;
        $SIG{PIPE}="DEFAULT";
        if ($sigpipe) {

-               return  "[[linkmap failed to run dot]]";
+               return  "[[".gettext("linkmap failed to run dot")."]]";

        }
 
        return $ret;
        }
 
        return $ret;