Improve wording of tagged() docs

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

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index a23436fd0bbbb19ad687db7a9b30d3f6940a23a4..cf8f25281585fff56ee8b11dd9c58bdfc64b793c 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -4,13 +4,22 @@ package IkiWiki::Plugin::brokenlinks;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

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

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

-} # }}}
+}

 
 

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

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


@@ -18,25 +27,39 @@ sub preprocess (@) { #{{{
        # register a dependency.
        add_depends($params{page}, $params{pages});
        
        # register a dependency.
        add_depends($params{page}, $params{pages});
        

-       my @broken;
-       foreach my $page (keys %links) {
-               if (pagespec_match($page, $params{pages})) {
-                       my $discussion=gettext("discussion");
-                       foreach my $link (@{$links{$page}}) {
-                               next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
-                               my $bestlink=bestlink($page, $link);
-                               next if length $bestlink;
-                               push @broken,
-                                       htmllink($page, $params{destpage}, $link, 1).
-                                       " from ".
-                                       htmllink($params{page}, $params{destpage}, $page, 1);
-                       }
+       my %broken;
+       foreach my $page (pagespec_match_list([keys %links],
+                       $params{pages}, location => $params{page})) {
+               my $discussion=gettext("Discussion");
+               my %seen;
+               foreach my $link (@{$links{$page}}) {
+                       next if $seen{$link};
+                       $seen{$link}=1;
+                       next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
+                       my $bestlink=bestlink($page, $link);
+                       next if length $bestlink;
+                       push @{$broken{$link}}, $page;

                }
        }
                }
        }

+
+       my @broken;
+       foreach my $link (keys %broken) {
+               my $page=$broken{$link}->[0];
+               push @broken, sprintf(gettext("%s from %s"),
+                       htmllink($page, $params{destpage}, $link, noimageinline => 1),
+                       join(", ", map {
+                               htmllink($params{page}, $params{destpage}, $_,  noimageinline => 1)
+                       } @{$broken{$link}}));
+       }

        
        

-       return gettext("There are no broken links!") unless @broken;
-       my %seen;
-       return "<ul>\n".join("\n", map { "<li>$_</li>" } grep { ! $seen{$_}++ } sort @broken)."</ul>\n";
-} # }}}
+       return gettext("There are no broken links!") unless %broken;
+       return "<ul>\n"
+               .join("\n",
+                       map {
+                               "<li>$_</li>"
+                       }
+                       sort @broken)
+               ."</ul>\n";
+}

 
 1
 
 1