summaryrefslogtreecommitdiff
path: root/Xerl/Page/Content.pm
diff options
context:
space:
mode:
authorPaul Buetow (mars.fritz.box) <paul@buetow.org>2013-10-03 13:10:12 +0200
committerPaul Buetow (mars.fritz.box) <paul@buetow.org>2013-10-03 13:10:12 +0200
commitf179bb94b7c657e1ae238e91c1bb92596ee3de27 (patch)
tree6e5c5217f2b8ffd9c4f1a00ffc35b2c167c8d952 /Xerl/Page/Content.pm
parenta6ef998abc0af8116d712297407cf2d980463efa (diff)
update all target
Diffstat (limited to 'Xerl/Page/Content.pm')
-rw-r--r--Xerl/Page/Content.pm86
1 files changed, 43 insertions, 43 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;