From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 15 Jul 2008 00:15:08 +0000 (-0400)
Subject: Merge commit 'smcv/aggregateinternal' into aggregateinternal
X-Git-Tag: 2.54~95
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/af48316b1d3a54cde1524d47773346f4cd39cb37?ds=inline;hp=-c

Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

	IkiWiki/Plugin/aggregate.pm
---

af48316b1d3a54cde1524d47773346f4cd39cb37
diff --combined IkiWiki/Plugin/aggregate.pm
index 1f09c988b,e93492863..2fcdec9e7
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@@ -21,6 -21,7 +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,45 -114,52 +114,51 @@@ sub launchaggregation () { #{{
  	return 1;
  } #}}}
  
+ #  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};
 -
 +		
  		$config{aggregateinternal} = 0;
  		my $oldname = pagefile($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");
  		}
  	}
 -
 +	
  	savestate();
  	IkiWiki::unlockwiki;
 -
 +	
  	unlockaggregate();
  } #}}}
  
@@@ -640,7 -648,7 +647,7 @@@ sub pagefile ($) { #{{
  } #}}}
  
  sub htmlfn ($) { #{{{
- 	return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
+ 	return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
  } #}}}
  
  my $aggregatelock;