From 5c0896e674eb69f45acb2837cd6fb231cef32a45 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Jul 2008 18:15:11 +0100 Subject: [PATCH] Make aggregated items be internal pages if --aggregateinternal is used. This addresses in a simple way. With this approach, a flag day is required, on which all users of aggregated pages start to inline them using the internal() pagespec; after that, the aggregateinternal option can safely be switched on in the setup file (and the old aggregated pages can be deleted by hand). --- IkiWiki/Plugin/aggregate.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index b5354a823..4fbcde390 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -30,7 +30,10 @@ sub getopt () { #{{{ eval q{use Getopt::Long}; error($@) if $@; Getopt::Long::Configure('pass_through'); - GetOptions("aggregate" => \$config{aggregate}); + GetOptions( + "aggregate" => \$config{aggregate}, + "aggregateinternal!" => \$config{aggregateinternal}, + ); } #}}} sub checkconfig () { #{{{ @@ -595,7 +598,7 @@ sub pagefile ($) { #{{{ } #}}} sub htmlfn ($) { #{{{ - return shift().".".$config{htmlext}; + return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext}; } #}}} my $aggregatelock; -- 2.44.0