add test for nonexistant polygen

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

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index d59f84450b797c4f55158c6587e1fce7f8edb7c8..9c28651f03e06306e7d319fee2a448dc0b93731e 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -70,7 +70,7 @@ sub preprocess (@) { #{{{
        $feed->{name}=$name;
        $feed->{sourcepage}=$params{page};
        $feed->{url}=$params{url};
-       my $dir=exists $params{dir} ? $params{dir} : IkiWiki::titlepage($params{name});
+       my $dir=exists $params{dir} ? $params{dir} : "feed/".IkiWiki::titlepage($params{name});
        $dir=~s/^\/+//;
        ($dir)=$dir=~/$IkiWiki::config{wiki_file_regexp}/;
        $feed->{dir}=$dir;
@@ -252,7 +252,10 @@ sub add_page (@) { #{{{
                $feed->{newposts}++;
 
                # assign it an unused page
-               my $page=$feed->{dir}."/".IkiWiki::titlepage($params{title});
+               my $page=IkiWiki::titlepage($params{title});
+               $page=~s!([/])!"__".ord($1)."__"!eg; # escape slashes in title
+               $page=$feed->{dir}."/".$page;
+               $page=lc($page);
                ($page)=$page=~/$IkiWiki::config{wiki_file_regexp}/;
                if (! defined $page || ! length $page) {
                        $page=$feed->{dir}."/item";
@@ -310,7 +313,7 @@ sub remove_feeds () { #{{{
 } #}}}
 
 sub pagefile ($) { #{{{
-       my $page=lc(shift);
+       my $page=shift;
 
        return "$IkiWiki::config{srcdir}/$page.html";
 } #}}}