* Fix a bug that caused link(foo) to succeed if page foo did not exist.

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index bdbcd536f6ffb381489ab977bd36170c3ea9daf4..ae86d79790f7ca2cb57b14448ae1c35880def876 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -31,7 +31,7 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

-       my $nolock=($config{post_commit} && ! commit_hook_enabled());
+       my $nolock=($config{post_commit} && ! IkiWiki::commit_hook_enabled());

        IkiWiki::lockwiki() unless $nolock;
        loadstate();
        if ($config{aggregate} && ! $nolock) {
        IkiWiki::lockwiki() unless $nolock;
        loadstate();
        if ($config{aggregate} && ! $nolock) {


@@ -244,7 +244,7 @@ sub aggregate () { #{{{
                if (! length $feed->{feedurl}) {
                        my @urls=XML::Feed->find_feeds($feed->{url});
                        if (! @urls) {
                if (! length $feed->{feedurl}) {
                        my @urls=XML::Feed->find_feeds($feed->{url});
                        if (! @urls) {

-                               $feed->{message}=sprintf(gettext("could not find feed at %s"), $feed->{feedurl});
+                               $feed->{message}=sprintf(gettext("could not find feed at %s"), $feed->{url});

                                $feed->{error}=1;
                                debug($feed->{message});
                                next;
                                $feed->{error}=1;
                                debug($feed->{message});
                                next;


@@ -321,7 +321,7 @@ sub add_page (@) { #{{{
                # NB: This doesn't check for path length limits.
                eval q{use POSIX};
                my $max=POSIX::pathconf($config{srcdir}, &POSIX::_PC_NAME_MAX);
                # NB: This doesn't check for path length limits.
                eval q{use POSIX};
                my $max=POSIX::pathconf($config{srcdir}, &POSIX::_PC_NAME_MAX);

-               if (defined $max && length(htmlpage($page)) >= $max) {
+               if (defined $max && length(htmlfn($page)) >= $max) {

                        $c="";
                        $page=$feed->{dir}."/item";
                        while (exists $IkiWiki::pagecase{lc $page.$c} ||
                        $c="";
                        $page=$feed->{dir}."/item";
                        while (exists $IkiWiki::pagecase{lc $page.$c} ||


@@ -357,7 +357,7 @@ sub add_page (@) { #{{{
        if (ref $feed->{tags}) {
                $template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
        }
        if (ref $feed->{tags}) {
                $template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
        }

-       writefile(htmlpage($guid->{page}), $config{srcdir},
+       writefile(htmlfn($guid->{page}), $config{srcdir},

                $template->output);
 
        # Set the mtime, this lets the build process get the right creation
                $template->output);
 
        # Set the mtime, this lets the build process get the right creation


@@ -432,7 +432,11 @@ sub remove_feeds () { #{{{
 sub pagefile ($) { #{{{
        my $page=shift;
 
 sub pagefile ($) { #{{{
        my $page=shift;
 

-       return "$config{srcdir}/".htmlpage($page);
+       return "$config{srcdir}/".htmlfn($page);
+} #}}}
+
+sub htmlfn ($) { #{{{
+       return shift().".html";

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