X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e95d3bb4fd1ea131a78b09ca2710df642f74c003..37245a9988d22938a8f13fb89cecc5c23bbed419:/IkiWiki/Plugin/aggregate.pm?ds=inline

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 9da619375..e000bc864 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -21,6 +21,7 @@ sub import { #{{{
 	hook(type => "preprocess", id => "aggregate", call => \&preprocess);
         hook(type => "delete", id => "aggregate", call => \&delete);
 	hook(type => "savestate", id => "aggregate", call => \&savestate);
+	hook(type => "htmlize", id => "_aggregated", call => \&htmlize);
 	if (exists $config{aggregate_webtrigger} && $config{aggregate_webtrigger}) {
 		hook(type => "cgi", id => "aggregate", call => \&cgi);
 	}
@@ -113,46 +114,58 @@ sub launchaggregation () { #{{{
 	return 1;
 } #}}}
 
-sub migrate_to_internal { #{{{
+#  Pages with extension _aggregated have plain html markup, pass through.
+sub htmlize (@) { #{{{
+	my %params=@_;
+	return $params{content};
+} #}}}
 
+# Used by ikiwiki-transition aggregateinternal.
+sub migrate_to_internal { #{{{
 	if (! lockaggregate()) {
-		error("an aggregation process is already running");
-		return;
+		error("an aggregation process is currently running");
 	}
 
 	IkiWiki::lockwiki();
 	loadstate();
+	$config{verbose}=1;
 
 	foreach my $data (values %guids) {
 		next unless $data->{page};
-
+		next if $data->{expired};
+		
 		$config{aggregateinternal} = 0;
 		my $oldname = pagefile($data->{page});
-
+		my $oldoutput = $config{destdir}."/".IkiWiki::htmlpage($data->{page});
+		
 		$config{aggregateinternal} = 1;
 		my $newname = pagefile($data->{page});
-
-		print "I: $oldname -> $newname\n";
+		
+		debug "moving $oldname -> $newname";
 		if (-e $newname) {
 			if (-e $oldname) {
 				error("$newname already exists");
 			}
 			else {
-				print STDERR 
-					"W: already renamed to $newname?\n";
+				debug("already renamed to $newname?");
 			}
 		}
 		elsif (-e $oldname) {
 			rename($oldname, $newname) || error("$!");
 		}
 		else {
-			print "W: $oldname not found\n";
+			debug("$oldname not found");
+		}
+		if (-e $oldoutput) {
+			require IkiWiki::Render;
+			debug("removing output file $oldoutput");
+			IkiWiki::prune($oldoutput);
 		}
 	}
-
+	
 	savestate();
 	IkiWiki::unlockwiki;
-
+	
 	unlockaggregate();
 } #}}}
 
@@ -641,7 +654,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-	return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
+	return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
 } #}}}
 
 my $aggregatelock;