Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add news item for ikiwiki 3.20091218
[git.ikiwiki.info.git]
/
IkiWiki
/
Setup
/
Standard.pm
diff --git
a/IkiWiki/Setup/Standard.pm
b/IkiWiki/Setup/Standard.pm
index f3d4994fb099a03fba7ee30a3071fbe4a37c9bf3..951bcfc56febfce724d82c652f96468c227709d2 100644
(file)
--- a/
IkiWiki/Setup/Standard.pm
+++ b/
IkiWiki/Setup/Standard.pm
@@
-9,11
+9,11
@@
use warnings;
use strict;
use IkiWiki;
use strict;
use IkiWiki;
-sub import {
#{{{
+sub import {
IkiWiki::Setup::merge($_[1]);
IkiWiki::Setup::merge($_[1]);
-}
#}}}
+}
-sub dumpline ($$$$) {
#{{{
+sub dumpline ($$$$) {
my $key=shift;
my $value=shift;
my $type=shift;
my $key=shift;
my $value=shift;
my $type=shift;
@@
-26,16
+26,17
@@
sub dumpline ($$$$) { #{{{
local $Data::Dumper::Pad="\t";
local $Data::Dumper::Sortkeys=1;
local $Data::Dumper::Quotekeys=0;
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;
my $dumpedvalue;
- if (
$type eq 'boolean' || $type eq 'integer'
) {
+ if (
($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/
) {
# avoid quotes
$dumpedvalue=$value;
}
# avoid quotes
$dumpedvalue=$value;
}
- elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
- ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+ elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
# dump simple array as qw{}
# dump simple array as qw{}
- $dumpedvalue="[qw{
".join(" ", @$value)."
}]";
+ $dumpedvalue="[qw{
".join(" ", @$value)."
}]";
}
else {
$dumpedvalue=Dumper($value);
}
else {
$dumpedvalue=Dumper($value);
@@
-54,16
+55,16
@@
sub dumpline ($$$$) { #{{{
}
return "\t$prefix$key => $dumpedvalue,";
}
return "\t$prefix$key => $dumpedvalue,";
-}
#}}}
+}
-sub dumpvalues ($@) {
#{{{
+sub dumpvalues ($@) {
my $setup=shift;
my @ret;
while (@_) {
my $key=shift;
my %info=%{shift()};
my $setup=shift;
my @ret;
while (@_) {
my $key=shift;
my %info=%{shift()};
- next if $info{type} eq "internal";
+ next if $
key eq "plugin" || $
info{type} eq "internal";
push @ret, "\t# ".$info{description} if exists $info{description};
push @ret, "\t# ".$info{description} if exists $info{description};
@@
-79,22
+80,24
@@
sub dumpvalues ($@) { #{{{
}
}
return @ret;
}
}
return @ret;
-}
#}}}
+}
-sub gendump ($) {
#{{{
+sub gendump ($) {
my $description=shift;
my %setup=(%config);
my @ret;
# disable logging to syslog while dumping
my $description=shift;
my %setup=(%config);
my @ret;
# disable logging to syslog while dumping
- $config{syslog}=
0
;
+ $config{syslog}=
undef
;
push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
foreach my $pair (IkiWiki::Setup::getsetup()) {
my $plugin=$pair->[0];
my $setup=$pair->[1];
push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
foreach my $pair (IkiWiki::Setup::getsetup()) {
my $plugin=$pair->[0];
my $setup=$pair->[1];
- push @ret, "", "\t# $plugin plugin";
- push @ret, dumpvalues(\%setup, @{$setup});
+ my @values=dumpvalues(\%setup, @{$setup});
+ if (@values) {
+ push @ret, "", "\t# $plugin plugin", @values;
+ }
}
unshift @ret,
}
unshift @ret,
@@
-109,6
+112,6
@@
sub gendump ($) { #{{{
push @ret, "}";
return @ret;
push @ret, "}";
return @ret;
-}
#}}}
+}
1
1