rather a lot of changes to make hyperestraier search be a plugin, allowing

[ikiwiki.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9aa9299ea366da17002716b03f10440e008d09e8..786ba70ace16abfaaa02498e3afb7e39a74f321a 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # Standard ikiwiki setup module.
 # Parameters to import should be all the standard ikiwiki config stuff,
-# plus hashes for cgiwrapper and svnwrapper, which specify any differing
-# config stuff for them and cause the wrappers to be made.
+# plus an array of wrappers to set up.
 
 use warnings;
 use strict;
@@ -20,22 +19,47 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
-       debug("generating wrappers..");
-       my %startconfig=(%config);
-       foreach my $wrapper (@{$setup{wrappers}}) {
-               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               checkoptions();
-               gen_wrapper();
+       if (! $config{refresh}) {
+               debug("generating wrappers..");
+               my @wrappers=@{$setup{wrappers}};
+               delete $setup{wrappers};
+               my %startconfig=(%config);
+               foreach my $wrapper (@wrappers) {
+                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       checkconfig();
+                       gen_wrapper();
+               }
+               %config=(%startconfig);
+       }
+       else {
+               delete $setup{wrappers};
        }
-       %config=(%startconfig);
        
-       debug("rebuilding wiki..");
        foreach my $c (keys %setup) {
-               $config{$c}=possibly_foolish_untaint($setup{$c})
-                       if defined $setup{$c} && ! ref $setup{$c};
+               if (defined $setup{$c}) {
+                       if (! ref $setup{$c}) {
+                               $config{$c}=possibly_foolish_untaint($setup{$c});
+                       }
+                       elsif (ref $setup{$c} eq 'ARRAY') {
+                               $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
+                       }
+               }
+               else {
+                       $config{$c}=undef;
+               }
+       }
+
+       if (! $config{refresh}) {
+               $config{rebuild}=1;
+               debug("rebuilding wiki..");
        }
-       $config{rebuild}=1;
-       checkoptions();
+       else {
+               debug("refreshing wiki..");
+       }
+
+       checkconfig();
+       lockwiki();
+       loadindex();
        refresh();
 
        debug("done");