diff options
| author | Paul Buetow (mars.fritz.box) <paul@buetow.org> | 2013-10-03 13:10:12 +0200 |
|---|---|---|
| committer | Paul Buetow (mars.fritz.box) <paul@buetow.org> | 2013-10-03 13:10:12 +0200 |
| commit | f179bb94b7c657e1ae238e91c1bb92596ee3de27 (patch) | |
| tree | 6e5c5217f2b8ffd9c4f1a00ffc35b2c167c8d952 /Xerl/Page | |
| parent | a6ef998abc0af8116d712297407cf2d980463efa (diff) | |
update all target
Diffstat (limited to 'Xerl/Page')
| -rw-r--r-- | Xerl/Page/Content.pm | 86 | ||||
| -rw-r--r-- | Xerl/Page/Document.pm | 2 | ||||
| -rw-r--r-- | Xerl/Page/Menu.pm | 4 | ||||
| -rw-r--r-- | Xerl/Page/Rules.pm | 4 | ||||
| -rw-r--r-- | Xerl/Page/Templates.pm | 6 |
5 files changed, 51 insertions, 51 deletions
diff --git a/Xerl/Page/Content.pm b/Xerl/Page/Content.pm index 5969ff0..38e4e54 100644 --- a/Xerl/Page/Content.pm +++ b/Xerl/Page/Content.pm @@ -21,7 +21,7 @@ use Xerl::XML::Element; use Xerl::XML::Reader; sub parse($) { - my Xerl::Page::Content $self = $_[0]; + my Xerl::Page::Content $self = $_[0]; my Xerl::Setup::Configure $config = $self->get_config(); my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new( @@ -38,7 +38,7 @@ sub parse($) { my Xerl::Page::Rules $rules = Xerl::Page::Rules->new( config => $config ); $rules->parse( $config->get_xmlconfigrootobj() ) - unless $config->exists('noparse'); + unless $config->exists('noparse'); $config->insertxmlvars( $config->get_xmlconfigrootobj() ); $self->insertrules( $rules, $xmlcontent->get_root() ); @@ -61,20 +61,20 @@ sub insertrules($$$$) { my $params = $element->get_params(); unshift @content, "Content-Type: $params->{type}\n\n" - if ref $params eq 'HASH' and exists $params->{type}; + if ref $params eq 'HASH' and exists $params->{type}; push @content, $self->_insertrules( $rules, $element ); $self->set_content( \@content ); -return undef; + return undef; } sub _insertrules($$$) { - my Xerl::Page::Content $self = $_[0]; - my Xerl::Page::Rules $rules = $_[1]; - my Xerl::XML::Element $element = $_[2]; + my Xerl::Page::Content $self = $_[0]; + my Xerl::Page::Rules $rules = $_[1]; + my Xerl::XML::Element $element = $_[2]; my Xerl::Setup::Configure $config = $self->get_config(); - my $nonewlines = 0; + my $nonewlines = 0; # Don't interate through the XML childs if we have a leaf node. return () unless ref $element->get_array() eq 'ARRAY'; @@ -122,13 +122,13 @@ sub _insertrules($$$) { } else { - if ($succ->get_flag_noendtag() == 1) { + if ( $succ->get_flag_noendtag() == 1 ) { + push @content, "<$name" . ( $succ->params_str() || '' ) . ">\n"; + } + else { push @content, - "<$name" . ( $succ->params_str() || '' ) . ">\n"; - } else { - push @content, - "<$name" . ( $succ->params_str() || '' ) . '>', - $self->_insertrules( $rules, $succ ), $text, "</$name>\n"; + "<$name" . ( $succ->params_str() || '' ) . '>', + $self->_insertrules( $rules, $succ ), $text, "</$name>\n"; } } } @@ -146,38 +146,38 @@ sub _insertrules($$$) { my ( $orule, $crule ) = ( $rule->[0], $rule->[1] ); $self->_insert_special_vars( $rules, $succ, \$orule ); - $self->_insert_special_vars( $rules, $succ, \$crule ); - chomp $orule; + $self->_insert_special_vars( $rules, $succ, \$crule ); + chomp $orule; - # Parse for known tag params. - if ( ref $params eq 'HASH' ) { - Xerl::Page::Templates::PARSELINE( $config, '%%', \$text ); + # Parse for known tag params. + if ( ref $params eq 'HASH' ) { + Xerl::Page::Templates::PARSELINE( $config, '%%', \$text ); - # <tag basename='yes'>path/to/file.bla</tag> => <tag>file.bla</tag> - $text =~ s#.*/(.*)$#$1# if lc $params->{basename} eq 'yes'; + # <tag basename='yes'>path/to/file.bla</tag> => <tag>file.bla</tag> + $text =~ s#.*/(.*)$#$1# if lc $params->{basename} eq 'yes'; - # <tag cut='?'>foo.bar.tld?options</tag> => <tag>?options</tag> - if ( exists $params->{cut} ) { - my $cut = quotemeta $params->{cut}; - $text =~ s/.*$cut(.*)$/$1/o; - } + # <tag cut='?'>foo.bar.tld?options</tag> => <tag>?options</tag> + if ( exists $params->{cut} ) { + my $cut = quotemeta $params->{cut}; + $text =~ s/.*$cut(.*)$/$1/o; + } - $text .= $params->{addback} - if exists $params->{addback}; - $text = $params->{addfront} . $text - if exists $params->{addfront}; -} + $text .= $params->{addback} + if exists $params->{addback}; + $text = $params->{addfront} . $text + if exists $params->{addfront}; + } -my $oadd = -exists $ruleparams->{addfront} -? '<' . $ruleparams->{addfront} -: ''; + my $oadd = + exists $ruleparams->{addfront} + ? '<' . $ruleparams->{addfront} + : ''; -my $cadd = -exists $ruleparams->{addback} ? $ruleparams->{addback} . '>' : ''; + my $cadd = + exists $ruleparams->{addback} ? $ruleparams->{addback} . '>' : ''; -push @content, $orule, $oadd, $self->_insertrules( $rules, $succ ), -$text, $cadd, $crule; + push @content, $orule, $oadd, $self->_insertrules( $rules, $succ ), + $text, $cadd, $crule; } } @@ -185,11 +185,11 @@ $text, $cadd, $crule; } sub _insert_special_vars($$$$) { - my Xerl::Page::Content $self = $_[0]; - my Xerl::Page::Rules $rules = $_[1]; - my Xerl::XML::Element $element = $_[2]; + my Xerl::Page::Content $self = $_[0]; + my Xerl::Page::Rules $rules = $_[1]; + my Xerl::XML::Element $element = $_[2]; my Xerl::Setup::Configure $config = $self->get_config(); - my $rtext = $_[3]; + my $rtext = $_[3]; $$rtext =~ s/@\@text\@\@/$_=$element->get_text();chomp;$_/geo; $$rtext =~ s/@\@ln\@\@//go; diff --git a/Xerl/Page/Document.pm b/Xerl/Page/Document.pm index a42c698..89ae788 100644 --- a/Xerl/Page/Document.pm +++ b/Xerl/Page/Document.pm @@ -18,7 +18,7 @@ use Xerl::Setup::Configure; use Xerl::Tools::FileIO; sub parse($) { - my Xerl::Page::Document $self = $_[0]; + my Xerl::Page::Document $self = $_[0]; my Xerl::Setup::Configure $config = $self->get_config(); return undef unless $config->document_exists(); diff --git a/Xerl/Page/Menu.pm b/Xerl/Page/Menu.pm index e22a0f6..0c957c8 100644 --- a/Xerl/Page/Menu.pm +++ b/Xerl/Page/Menu.pm @@ -18,7 +18,7 @@ use Xerl::Tools::FileIO; use Xerl::XML::Element; sub generate($;$) { - my Xerl::Page::Menu $self = $_[0]; + my Xerl::Page::Menu $self = $_[0]; my Xerl::Setup::Configure $config = $self->get_config(); my @site = split /\//, $config->get_site(); @@ -46,7 +46,7 @@ sub generate($;$) { } sub get_menu($$$$) { - my Xerl::Page::Menu $self = $_[0]; + my Xerl::Page::Menu $self = $_[0]; my Xerl::Setup::Configure $config = $self->get_config(); my ( $content, $siteadd, $compare ) = ( @_[ 1 ... 2 ], lc $_[3] ); diff --git a/Xerl/Page/Rules.pm b/Xerl/Page/Rules.pm index 5151e05..6a59285 100644 --- a/Xerl/Page/Rules.pm +++ b/Xerl/Page/Rules.pm @@ -17,8 +17,8 @@ use Xerl::Setup::Configure; use Xerl::XML::Element; sub parse($) { - my Xerl::Page::Rules $self = $_[0]; - my Xerl::XML::Element $element = $_[1]; + my Xerl::Page::Rules $self = $_[0]; + my Xerl::XML::Element $element = $_[1]; my Xerl::Setup::Configure $config = $self->get_config(); $element = $element->starttag2( 'rules', $config->get_outputformat() ); diff --git a/Xerl/Page/Templates.pm b/Xerl/Page/Templates.pm index e530bca..1e5bcb0 100644 --- a/Xerl/Page/Templates.pm +++ b/Xerl/Page/Templates.pm @@ -24,7 +24,7 @@ use Xerl::Tools::FileIO; use constant RECURSIVE => 1; sub parse($) { - my Xerl::Page::Templates $self = $_[0]; + my Xerl::Page::Templates $self = $_[0]; my Xerl::Setup::Configure $config = $self->get_config(); my $site = $config->get_site(); @@ -144,7 +144,7 @@ sub parse($) { } sub parsetemplate($$;$) { - my Xerl::Page::Templates $self = $_[0]; + my Xerl::Page::Templates $self = $_[0]; my Xerl::Setup::Configure $config = $self->get_config(); my $deepnesslevel = $_[2] || 0; @@ -161,7 +161,7 @@ sub parsetemplate($$;$) { } sub print($;$) { - my Xerl::Page::Templates $self = $_[0]; + my Xerl::Page::Templates $self = $_[0]; my Xerl::Setup::Configure $config = $self->get_config(); my ( $code, $flag ) = ( '', 0 ); |
