X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/42ac4ec00959bd6162076af799023545b698bed9..6d22987b4e82a978bb37229db210fc9ba14f44bd:/IkiWiki/Plugin/aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 673668c0e..2b40625db 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -40,6 +40,10 @@ sub getopt () { #{{{
 
 sub getsetup () { #{{{
 	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
 		aggregateinternal => {
 			type => "boolean",
 			example => 0,
@@ -417,7 +421,7 @@ sub expire () { #{{{
 		my $count=0;
 		my %seen;
 		foreach my $item (sort { $IkiWiki::pagectime{$b->{page}} <=> $IkiWiki::pagectime{$a->{page}} }
-		                  grep { exists $_->{page} && $_->{feed} eq $feed->{name} && $IkiWiki::pagectime{$_->{page}} }
+		                  grep { exists $_->{page} && $_->{feed} eq $feed->{name} }
 		                  values %guids) {
 			if ($feed->{expireage}) {
 				my $days_old = (time - $IkiWiki::pagectime{$item->{page}}) / 60 / 60 / 24;
@@ -516,12 +520,18 @@ sub aggregate (@) { #{{{
 		}
 
 		foreach my $entry ($f->entries) {
+			my $content=$content=$entry->content->body;
+			# atom feeds may have no content, only a summary
+			if (! defined $content && ref $entry->summary) {
+				$content=$entry->summary->body;
+			}
+
 			add_page(
 				feed => $feed,
 				copyright => $f->copyright,
 				title => defined $entry->title ? decode_entities($entry->title) : "untitled",
 				link => $entry->link,
-				content => defined $entry->content->body ? $entry->content->body : "",
+				content => defined $content ? $content : "",
 				guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
 				ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
 			);
@@ -608,10 +618,13 @@ sub add_page (@) { #{{{
 	writefile(htmlfn($guid->{page}), $config{srcdir},
 		$template->output);
 
-	# Set the mtime, this lets the build process get the right creation
-	# time on record for the new page.
-	utime $mtime, $mtime, pagefile($guid->{page})
-		if defined $mtime && $mtime <= time;
+	if (defined $mtime && $mtime <= time) {
+		# Set the mtime, this lets the build process get the right
+		# creation time on record for the new page.
+		utime $mtime, $mtime, pagefile($guid->{page});
+		# Store it in pagectime for expiry code to use also.
+		$IkiWiki::pagectime{$guid->{page}}=$mtime;
+	}
 } #}}}
 
 sub htmlescape ($) { #{{{