split up refresh

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

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 82b38f4cb79909c449e29bd8a68340db9d343bde..d0671ae0e93b7877aef75b314158145ce61770db 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -3,24 +3,33 @@ package IkiWiki::Plugin::linkmap;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use IPC::Open2;
 
 use IPC::Open2;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "linkmap", call => \&getsetup);

        hook(type => "preprocess", id => "linkmap", call => \&preprocess);
        hook(type => "format", id => "linkmap", call => \&format);
        hook(type => "preprocess", id => "linkmap", call => \&preprocess);
        hook(type => "format", id => "linkmap", call => \&format);

-} # }}}
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}

 
 my $mapnum=0;
 my %maps;
 
 
 my $mapnum=0;
 my %maps;
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        my %params=@_;
 
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
 
        $params{pages}="*" unless defined $params{pages};
        

-       # Needs to update whenever a page is added or removed, so
-       # register a dependency.
+       # Needs to update whenever a page is added, removed, or
+       # its links change, so register a dependency.

        add_depends($params{page}, $params{pages});
        
        # Can't just return the linkmap here, since the htmlscrubber
        add_depends($params{page}, $params{pages});
        
        # Can't just return the linkmap here, since the htmlscrubber


@@ -30,17 +39,17 @@ sub preprocess (@) { #{{{
        $mapnum++;
        $maps{$mapnum}=\%params;
        return "<div class=\"linkmap$mapnum\"></div>";
        $mapnum++;
        $maps{$mapnum}=\%params;
        return "<div class=\"linkmap$mapnum\"></div>";

-} # }}}
+}

 
 

-sub format (@) { #{{{
+sub format (@) {

         my %params=@_;
 
        $params{content}=~s/<div class=\"linkmap(\d+)"><\/div>/genmap($1)/eg;
 
         return $params{content};
         my %params=@_;
 
        $params{content}=~s/<div class=\"linkmap(\d+)"><\/div>/genmap($1)/eg;
 
         return $params{content};

-} # }}}
+}

 
 

-sub genmap ($) { #{{{
+sub genmap ($) {

        my $mapnum=shift;
        return "" unless exists $maps{$mapnum};
        my %params=%{$maps{$mapnum}};
        my $mapnum=shift;
        return "" unless exists $maps{$mapnum};
        my %params=%{$maps{$mapnum}};


@@ -94,11 +103,9 @@ 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;

-} #}}}
+}

 
 1
 
 1