X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b220a1100869bc930ed886062d95c464a0bc3689..88830016154d99a0155e1cee58582e9f32dcca51:/IkiWiki/Plugin/aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 41ca9cce0..98e534366 100644
--- 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;
@@ -83,6 +83,7 @@ sub preprocess (@) { #{{{
 	$feed->{numposts}=0 unless defined $feed->{numposts};
 	$feed->{newposts}=0 unless defined $feed->{newposts};
 	$feed->{message}="new feed" unless defined $feed->{message};
+	$feed->{tags}=[];
 	while (@_) {
 		my $key=shift;
 		my $value=shift;
@@ -187,7 +188,8 @@ sub aggregate () { #{{{
 	die $@ if $@;
 
 	foreach my $feed (values %feeds) {
-		next unless time - $feed->{lastupdate} >= $feed->{updateinterval};
+		next unless $IkiWiki::config{rebuild} || 
+			time - $feed->{lastupdate} >= $feed->{updateinterval};
 		$feed->{lastupdate}=time;
 		$feed->{newposts}=0;
 		$IkiWiki::forcerebuild{$feed->{sourcepage}}=1;
@@ -251,7 +253,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";
@@ -273,7 +278,7 @@ sub add_page (@) { #{{{
 	eval q{use Digest::MD5 'md5_hex'};
 	require Encode;
 	my $digest=md5_hex(Encode::encode_utf8($params{content}));
-	return unless ! exists $guid->{md5} || $guid->{md5} ne $digest;
+	return unless ! exists $guid->{md5} || $guid->{md5} ne $digest || $IkiWiki::config{rebuild};
 	$guid->{md5}=$digest;
 
 	# Create the page.
@@ -281,6 +286,8 @@ sub add_page (@) { #{{{
 	my $content=$params{content};
 	$params{content}=~s/(?<!\\)\[\[/\\\[\[/g; # escape accidental wikilinks
 	                                          # and preprocessor stuff
+	$template->param(title => $params{title})
+		if defined $params{title} && length($params{title});
 	$template->param(content => $params{content});
 	$template->param(url => $feed->{url});
 	$template->param(name => $feed->{name});