the 100% correct way is to add it to %links on scan

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

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index bd3c6b8b9f8e4157856417847458832fbe731d26..3a0150d53e4c52b08fe076bf276c1bb2e6e563dd 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -4,10 +4,10 @@ package IkiWiki::Plugin::orphans;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::register_plugin("preprocess", "orphans", \&preprocess);
+       hook(type => "preprocess", id => "orphans", call => \&preprocess);

 } # }}}
 
 sub preprocess (@) { #{{{
 } # }}}
 
 sub preprocess (@) { #{{{


@@ -16,26 +16,39 @@ sub preprocess (@) { #{{{
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.

-       IkiWiki::add_depends($params{page}, $params{pages});
+       add_depends($params{page}, $params{pages});

        
        my %linkedto;
        
        my %linkedto;

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

        }
        
        my @orphans;
        }
        
        my @orphans;

-       foreach my $page (keys %IkiWiki::renderedfiles) {
+       my $discussion=gettext("discussion");
+       foreach my $page (keys %pagesources) {

                next if $linkedto{$page};
                next if $linkedto{$page};

-               next unless IkiWiki::globlist_match($page, $params{pages});
+               next unless pagespec_match($page, $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.
                # 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 $_ && $_ !~/\/Discussion$/i && IkiWiki::bestlink($page, $_) ne $page } @{$IkiWiki::links{$page}};
+               next if grep { 
+                       length $_ &&
+                       ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) &&
+                       bestlink($page, $_) !~ /^($page|)$/ 
+               } @{$links{$page}};

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

-       return "All pages are linked to by other pages." unless @orphans;
-       return "<ul>\n".join("\n", map { "<li>".IkiWiki::htmllink($params{page}, $_, 1)."</li>" } sort @orphans)."</ul>\n";
+       return gettext("All pages are linked to by other pages.") unless @orphans;
+       return "<ul>\n".
+               join("\n",
+                       map {
+                               "<li>".
+                               htmllink($params{page}, $params{destpage}, $_,
+                                        noimageinline => 1).
+                               "</li>"
+                       } sort @orphans).
+               "</ul>\n";

 } # }}}
 
 1
 } # }}}
 
 1