typo

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4d1118f304b871024b93157a4c5fea941ed96cd9..c8506930475a0c28ead9e613e7cde64d982b6db9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,37 +1,69 @@
 #!/usr/bin/perl
 #!/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;
 
 use warnings;
 use strict;
 
 package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;

+use IkiWiki;

 
 

+# Parameters to import should be all the standard ikiwiki config, in a hash.

 sub import {
 sub import {

-       my %setup=%{$_[1]};
+       IkiWiki::Setup::merge($_[1]);
+}

 
 

-       ::debug("generating wrappers..");
-       my %startconfig=(%::config);
-       foreach my $wrapper (@{$setup{wrappers}}) {
-               %::config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               ::checkoptions();
-               ::gen_wrapper();
-       }
-       %::config=(%startconfig);
+sub gendump ($@) {
+       my $class=shift;
+
+       "#!/usr/bin/perl",
+       "#",
+       (map { "# $_" } @_),
+       "use IkiWiki::Setup::Standard {",
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+       "}"
+}
+
+sub dumpline ($$$$) {
+       my $key=shift;
+       my $value=shift;
+       my $type=shift;
+       my $prefix=shift;

        
        

-       ::debug("rebuilding wiki..");
-       foreach my $c (keys %setup) {
-               $::config{$c}=::possibly_foolish_untaint($setup{$c})
-                       if defined $setup{$c} && ! ref $setup{$c};
+       eval q{use Data::Dumper};
+       error($@) if $@;
+       local $Data::Dumper::Terse=1;
+       local $Data::Dumper::Indent=1;
+       local $Data::Dumper::Pad="\t";
+       local $Data::Dumper::Sortkeys=1;
+       local $Data::Dumper::Quotekeys=0;
+       # only the perl version preserves utf-8 in output
+       local $Data::Dumper::Useperl=1;
+       
+       my $dumpedvalue;
+       if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
+               # avoid quotes
+               $dumpedvalue=$value;

        }
        }

-       $::config{rebuild}=1;
-       ::checkoptions();
-       ::refresh();
-
-       ::debug("done");
-       ::saveindex();
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{".join(" ", @$value)."}]";
+       }
+       else {
+               $dumpedvalue=Dumper($value);
+               chomp $dumpedvalue;
+               if (length $prefix) {
+                       # add to second and subsequent lines
+                       my @lines=split(/\n/, $dumpedvalue);
+                       $dumpedvalue="";
+                       for (my $x=0; $x <= $#lines; $x++) {
+                               $lines[$x] =~ s/^\t//;
+                               $dumpedvalue.="\t".($x ? $prefix : "").$lines[$x]."\n";
+                       }
+               }
+               $dumpedvalue=~s/^\t//;
+               chomp $dumpedvalue;
+       }
+       
+       return "\t$prefix$key => $dumpedvalue,";

 }
 
 1
 }
 
 1