Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index f221954b807fedf1eb8612ab13a5a333702dbfe3..71122677273275d3e2f160bde3c8b44a8f333e49 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,13 +4,22 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

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

        hook(type => "preprocess", id => "orphans", call => \&preprocess);
        hook(type => "preprocess", id => "orphans", 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,28 +27,22 @@ sub preprocess (@) { #{{{
        # register a dependency.
        add_depends($params{page}, $params{pages});
        
        # register a dependency.
        add_depends($params{page}, $params{pages});
        

-       my %linkedto;
-       foreach my $p (keys %links) {
-               map { $linkedto{bestlink($p, $_)}=1 if length $_ }
-                       @{$links{$p}};
-       }
-       

        my @orphans;
        my @orphans;

-       my $discussion=gettext("discussion");
-       foreach my $page (keys %renderedfiles) {
-               next if $linkedto{$page};
-               next unless pagespec_match($page, $params{pages}, $params{page});
+       foreach my $page (pagespec_match_list(
+                       [ grep { ! IkiWiki::backlink_pages($_) && $_ ne 'index' }
+                               keys %pagesources ],
+                       $params{pages}, location => $params{page})) {

                # If the page has a link to some other page, it's
                # indirectly linked to a page via that page's backlinks.
                next if grep { 
                        length $_ &&
                # If the page has a link to some other page, it's
                # indirectly linked to a page via that page's backlinks.
                next if grep { 
                        length $_ &&

-                       ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
-                       bestlink($page, $_) !~ /^($page|)$/ 
+                       ($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) &&
+                       bestlink($page, $_) !~ /^(\Q$page\E|)$/ 

                } @{$links{$page}};
                push @orphans, $page;
        }
        
                } @{$links{$page}};
                push @orphans, $page;
        }
        

-       return gettext("All pages are linked to by other pages.") unless @orphans;
+       return gettext("All pages have other pages linking to them.") unless @orphans;

        return "<ul>\n".
                join("\n",
                        map {
        return "<ul>\n".
                join("\n",
                        map {


@@ -49,6 +52,6 @@ sub preprocess (@) { #{{{
                                "</li>"
                        } sort @orphans).
                "</ul>\n";
                                "</li>"
                        } sort @orphans).
                "</ul>\n";

-} # }}}
+}

 
 1
 
 1