Merge commit 'smcv/aggregateinternal' into aggregateinternal

[ikiwiki.git] / IkiWiki / Plugin / aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 9da619375df515ec4e8d236d10ce7b7b5b2c2130..2fcdec9e73d71ad303ff4f807d8f81a9bcc58248 100644 (file)
--- 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,51 @@ 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};
-
+               
                $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();
 } #}}}
 
@@ -641,7 +647,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-       return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
+       return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
 } #}}}
 
 my $aggregatelock;