web commit by DavidSchmitt

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index da712e94aa784ea482f622e35fd4632ec0223635..b26df006b9d3e1d0ae58249ed4417f0f3c9f3746 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -4,33 +4,51 @@
 # plus hashes for cgiwrapper and svnwrapper, which specify any differing
 # config stuff for them and cause the wrappers to be made.
 
 # 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;
-

 use warnings;
 use strict;
 use warnings;
 use strict;

+use IkiWiki::Wrapper;
+use IkiWiki::Render;
+
+package IkiWiki::Setup::Standard;

 
 sub import {
 
 sub import {

+       IkiWiki::setup_standard(@_);
+}
+       
+package IkiWiki;
+
+sub setup_standard {

        my %setup=%{$_[1]};
 
        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 %startconfig=(%config);
+               foreach my $wrapper (@{$setup{wrappers}}) {
+                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       checkconfig();
+                       gen_wrapper();
+               }
+               %config=(%startconfig);

        }
        }

-
-       ::debug("rebuilding wiki..");

        foreach my $c (keys %setup) {
        foreach my $c (keys %setup) {

-               $::config{$c}=::possibly_foolish_untaint($setup{$c})
+               $config{$c}=possibly_foolish_untaint($setup{$c})

                        if defined $setup{$c} && ! ref $setup{$c};
        }
                        if defined $setup{$c} && ! ref $setup{$c};
        }

-       $::config{rebuild}=1;
-       ::checkoptions();
-       ::refresh();
+       if (! $config{refresh}) {
+               $config{rebuild}=1;
+               debug("rebuilding wiki..");
+       }
+       else {
+               debug("refreshing wiki..");
+       }
+
+       checkconfig();
+       lockwiki();
+       loadindex();
+       refresh();

 
 

-       ::debug("done");
-       ::saveindex();
+       debug("done");
+       saveindex();

 }
 
 1
 }
 
 1