X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0a52e8fd82d80bdd1290f49c3187d3f72db39c75..b0e7e2e123079a2e68924cfb90d19c44571b1f65:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 7be4f891a..786ba70ac 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,33 +1,69 @@
 #!/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.
-
-package IkiWiki::Setup::Standard;
+# plus an array of wrappers to set up.
 
 use warnings;
 use strict;
+use IkiWiki::Wrapper;
+use IkiWiki::Render;
+
+package IkiWiki::Setup::Standard;
 
 sub import {
-	my %setup=%{$_[1]};
+	IkiWiki::setup_standard(@_);
+}
+	
+package IkiWiki;
 
+sub setup_standard {
+	my %setup=%{$_[1]};
 
-	::debug("generating wrappers..");
-	foreach my $wrapper (@{$setup{wrapper}}) {
-		::gen_wrapper(%::config, %setup, %{$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);
 	}
-
-	::debug("rebuilding wiki..");
+	else {
+		delete $setup{wrappers};
+	}
+	
 	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..");
+	}
+	else {
+		debug("refreshing wiki..");
 	}
-	$::config{rebuild}=1;
-	::refresh();
 
-	::debug("done");
-	::saveindex();
+	checkconfig();
+	lockwiki();
+	loadindex();
+	refresh();
+
+	debug("done");
+	saveindex();
 }
 
 1