summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--Xerl.pm56
-rw-r--r--Xerl/Base.pm116
-rw-r--r--Xerl/Main/Global.pm64
-rw-r--r--Xerl/Page/Configure.pm188
-rw-r--r--Xerl/Page/Content.pm280
-rw-r--r--Xerl/Page/Document.pm50
-rw-r--r--Xerl/Page/Menu.pm136
-rw-r--r--Xerl/Page/Parameter.pm44
-rw-r--r--Xerl/Page/Request.pm40
-rw-r--r--Xerl/Page/Rules.pm86
-rw-r--r--Xerl/Page/Templates.pm282
-rw-r--r--Xerl/Tools/FileIO.pm172
-rw-r--r--Xerl/XML/Element.pm98
-rw-r--r--Xerl/XML/Reader.pm282
-rwxr-xr-xindex.fpl4
16 files changed, 932 insertions, 972 deletions
diff --git a/Makefile b/Makefile
index 1fd9f8d..757c3fc 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ replace:
w .tmp" {} && mv -f .tmp {}' \;
chmod 755 index.pl
perltidy:
- find . -name \*.fpl | xargs perltidy -b
- find . -name \*.pl | xargs perltidy -b
- find . -name \*.pm | xargs perltidy -b
+ find . -name \*.fpl | xargs perltidy -i=2 -b
+ find . -name \*.pl | xargs perltidy -i=2 -b
+ find . -name \*.pm | xargs perltidy -i=2 -b
find . -name \*.bak | xargs rm -f
todo:
grep -R TODO . | grep -v Makefile | grep -v .git
diff --git a/Xerl.pm b/Xerl.pm
index 8844e85..c8d816a 100644
--- a/Xerl.pm
+++ b/Xerl.pm
@@ -44,45 +44,45 @@ use Xerl::Page::Request;
use Xerl::Page::Templates;
sub run($) {
- my Xerl $self = $_[0];
- my $time = [gettimeofday];
+ my Xerl $self = $_[0];
+ my $time = [gettimeofday];
- my Xerl::Page::Request $request =
- Xerl::Page::Request->new( request => $ENV{REQUEST_URI} );
+ my Xerl::Page::Request $request =
+ Xerl::Page::Request->new( request => $ENV{REQUEST_URI} );
- $request->parse();
- my Xerl::Page::Configure $config =
- Xerl::Page::Configure->new( config => $self->get_config(), %$request );
+ $request->parse();
+ my Xerl::Page::Configure $config =
+ Xerl::Page::Configure->new( config => $self->get_config(), %$request );
- $config->parse();
- return undef if $config->finish_request_exists();
+ $config->parse();
+ return undef if $config->finish_request_exists();
- $config->defaults();
+ $config->defaults();
- my Xerl::Page::Parameter $parameter =
- Xerl::Page::Parameter->new( config => $config );
+ my Xerl::Page::Parameter $parameter =
+ Xerl::Page::Parameter->new( config => $config );
- $parameter->parse();
- return undef if $config->finish_request_exists();
+ $parameter->parse();
+ return undef if $config->finish_request_exists();
- if ( $config->document_exists() ) {
- my Xerl::Page::Document $document =
- Xerl::Page::Document->new( config => $config );
+ if ( $config->document_exists() ) {
+ my Xerl::Page::Document $document =
+ Xerl::Page::Document->new( config => $config );
- $document->parse();
- return undef if $config->finish_request_exists();
+ $document->parse();
+ return undef if $config->finish_request_exists();
- }
- else {
- my Xerl::Page::Templates $templates =
- Xerl::Page::Templates->new( config => $config );
+ }
+ else {
+ my Xerl::Page::Templates $templates =
+ Xerl::Page::Templates->new( config => $config );
- $templates->parse();
- return undef if $config->finish_request_exists();
- $templates->print($time);
- }
+ $templates->parse();
+ return undef if $config->finish_request_exists();
+ $templates->print($time);
+ }
- return undef;
+ return undef;
}
1;
diff --git a/Xerl/Base.pm b/Xerl/Base.pm
index 53368a9..6b71565 100644
--- a/Xerl/Base.pm
+++ b/Xerl/Base.pm
@@ -33,97 +33,97 @@ use strict;
use warnings;
sub new ($;) {
- my $self = shift;
+ my $self = shift;
- bless {@_} => $self;
+ bless {@_} => $self;
}
sub setval($$$) {
- my UNIVERSAL $self = $_[0];
+ my UNIVERSAL $self = $_[0];
- $self->{ $_[1] } = $_[2];
+ $self->{ $_[1] } = $_[2];
- return undef;
+ return undef;
}
sub getval($$) {
- my UNIVERSAL $self = $_[0];
+ my UNIVERSAL $self = $_[0];
- return defined $self->{ $_[1] } ? $self->{ $_[1] } : '';
+ return defined $self->{ $_[1] } ? $self->{ $_[1] } : '';
}
sub exists($$) {
- my UNIVERSAL $self = $_[0];
+ my UNIVERSAL $self = $_[0];
- return exists $self->{ $_[1] } ? 1 : 0;
+ return exists $self->{ $_[1] } ? 1 : 0;
}
sub AUTOLOAD {
- my UNIVERSAL $self = $_[0];
- my $auto = our $AUTOLOAD;
- return $self if $auto =~ /DESTROY/;
+ my UNIVERSAL $self = $_[0];
+ my $auto = our $AUTOLOAD;
+ return $self if $auto =~ /DESTROY/;
- if ( $auto =~ /.*::set_(.+)$/ ) {
- $self->{$1} = $_[1];
+ if ( $auto =~ /.*::set_(.+)$/ ) {
+ $self->{$1} = $_[1];
- }
- elsif ( $auto =~ /.*::get_(.+)_ref$/ ) {
- return defined $self->{$1} ? \$self->{$1} : [''];
-
- }
- elsif ( $auto =~ /.*::get_(.+)$/ ) {
- return defined $self->{$1} ? $self->{$1} : '';
+ }
+ elsif ( $auto =~ /.*::get_(.+)_ref$/ ) {
+ return defined $self->{$1} ? \$self->{$1} : [''];
- }
- elsif ( $auto =~ /.*::undef_(.+)$/ ) {
- return '' unless defined $self->{$1};
+ }
+ elsif ( $auto =~ /.*::get_(.+)$/ ) {
+ return defined $self->{$1} ? $self->{$1} : '';
- my $retval = $self->{$1};
- undef $self->{$1};
- return $retval;
+ }
+ elsif ( $auto =~ /.*::undef_(.+)$/ ) {
+ return '' unless defined $self->{$1};
- }
- elsif ( $auto =~ /.*::append_(.+)$/ ) {
- if ( defined $self->{$1} ) {
- $self->{$1} .= $_[1];
+ my $retval = $self->{$1};
+ undef $self->{$1};
+ return $retval;
- }
- else {
- $self->{$1} = $_[1];
- }
+ }
+ elsif ( $auto =~ /.*::append_(.+)$/ ) {
+ if ( defined $self->{$1} ) {
+ $self->{$1} .= $_[1];
}
- elsif ( $auto =~ /.*::push_(.+)$/ ) {
- if ( exists $self->{$1} ) {
- push @{ $self->{$1} }, $_[1];
+ else {
+ $self->{$1} = $_[1];
+ }
- }
- else {
- $self->{$1} = [ $_[1] ];
- }
+ }
+ elsif ( $auto =~ /.*::push_(.+)$/ ) {
+ if ( exists $self->{$1} ) {
+ push @{ $self->{$1} }, $_[1];
}
- elsif ( $auto =~ /.*::first_(.+)$/ ) {
- return exists $self->{$1} ? ${ $self->{$1} }[0] : '';
-
+ else {
+ $self->{$1} = [ $_[1] ];
}
- elsif ( $auto =~ /.*::(.+)_exists$/ ) {
- return exists $self->{$1} ? 1 : 0;
- }
- elsif ( $auto =~ /.*::(.+)_length$/ ) {
- return ( ref $self->{$1} eq 'ARRAY' ) ? scalar @{ $self->{$1} } : 0;
+ }
+ elsif ( $auto =~ /.*::first_(.+)$/ ) {
+ return exists $self->{$1} ? ${ $self->{$1} }[0] : '';
- }
- elsif ( $auto =~ /.*::(.+)_isset$/ ) {
- return exists $self->{$1} ? $self->{ $_[0] } : 0;
+ }
+ elsif ( $auto =~ /.*::(.+)_exists$/ ) {
+ return exists $self->{$1} ? 1 : 0;
- }
- else {
- print "$auto is not a method of $self or UNIVERSAL\n";
- }
+ }
+ elsif ( $auto =~ /.*::(.+)_length$/ ) {
+ return ( ref $self->{$1} eq 'ARRAY' ) ? scalar @{ $self->{$1} } : 0;
+
+ }
+ elsif ( $auto =~ /.*::(.+)_isset$/ ) {
+ return exists $self->{$1} ? $self->{ $_[0] } : 0;
+
+ }
+ else {
+ print "$auto is not a method of $self or UNIVERSAL\n";
+ }
- return $self;
+ return $self;
}
1;
diff --git a/Xerl/Main/Global.pm b/Xerl/Main/Global.pm
index bd2b140..f70ef6d 100644
--- a/Xerl/Main/Global.pm
+++ b/Xerl/Main/Global.pm
@@ -30,67 +30,67 @@
package Xerl::Main::Global;
sub SHUTDOWN {
- exit 0;
+ exit 0;
- # Never reach this point
- return undef;
+ # Never reach this point
+ return undef;
}
sub DEBUG {
- print 'Debug::', @_, "\n";
+ print 'Debug::', @_, "\n";
- return undef;
+ return undef;
}
sub ERROR {
- print "Content-Type: text/plain\n\nXerl runtime error: ",
- join( ' ', time, @_ );
+ print "Content-Type: text/plain\n\nXerl runtime error: ",
+ join( ' ', time, @_ );
- Xerl::Main::Global::SHUTDOWN();
+ Xerl::Main::Global::SHUTDOWN();
- # Never reach this point
- return undef;
+ # Never reach this point
+ return undef;
}
sub PLAIN {
- print "Content-Type: text/plain\n\n";
+ print "Content-Type: text/plain\n\n";
- DEBUG(@_) if @_;
+ DEBUG(@_) if @_;
- return undef;
+ return undef;
}
sub REDIRECT ($) {
- my $location = shift;
- print "Status: 301 Moved Permanantly\n";
- print "Location: $location\n\n";
- return undef;
+ my $location = shift;
+ print "Status: 301 Moved Permanantly\n";
+ print "Location: $location\n\n";
+ return undef;
}
sub _HTTP_DESCR ($;$) {
- my ( $status, $infomsg ) = @_;
+ my ( $status, $infomsg ) = @_;
- $infomsg //= '';
+ $infomsg //= '';
- if ( $status == 404 ) {
- "Status: 404 Not Found $infomsg\015\012\n\n"
+ if ( $status == 404 ) {
+ "Status: 404 Not Found $infomsg\015\012\n\n"
- }
- else {
- "Status: 405 Method not allowed $infomsg\015\012\n\n";
- }
+ }
+ else {
+ "Status: 405 Method not allowed $infomsg\015\012\n\n";
+ }
}
sub HTTP {
- my $descr = _HTTP_DESCR(shift);
- print $descr;
- local $, = ' ';
- print $descr;
+ my $descr = _HTTP_DESCR(shift);
+ print $descr;
+ local $, = ' ';
+ print $descr;
- Xerl::Main::Global::SHUTDOWN();
+ Xerl::Main::Global::SHUTDOWN();
- # Never reach this point
- return undef;
+ # Never reach this point
+ return undef;
}
1;
diff --git a/Xerl/Page/Configure.pm b/Xerl/Page/Configure.pm
index dfe4ec4..1a9ecde 100644
--- a/Xerl/Page/Configure.pm
+++ b/Xerl/Page/Configure.pm
@@ -37,134 +37,134 @@ use Xerl::Tools::FileIO;
use Xerl::XML::Element;
sub parse($) {
- my Xerl::Page::Configure $self = $_[0];
+ my Xerl::Page::Configure $self = $_[0];
- my Xerl::Tools::FileIO $file =
- Xerl::Tools::FileIO->new( 'path' => $self->get_config() );
+ my Xerl::Tools::FileIO $file =
+ Xerl::Tools::FileIO->new( 'path' => $self->get_config() );
- if ( -1 == $file->fslurp() ) {
- $self->set_finish_request(1);
- return undef;
- }
+ if ( -1 == $file->fslurp() ) {
+ $self->set_finish_request(1);
+ return undef;
+ }
- my $re = qr/^(.+?) *=(.+?) *\n?$/;
+ my $re = qr/^(.+?) *=(.+?) *\n?$/;
- for ( @{ $file->get_array() } ) {
- next if /^ *#/;
+ for ( @{ $file->get_array() } ) {
+ next if /^ *#/;
- $self->setval( $1, $self->eval($2) ) if $_ =~ $re;
- }
+ $self->setval( $1, $self->eval($2) ) if $_ =~ $re;
+ }
- return $self;
+ return $self;
}
sub defaults($) {
- my Xerl::Page::Configure $self = $_[0];
-
- $self->set_proto('https') if exists $ENV{HTTPS};
-
- $self->set_site( $self->get_defaultcontent() )
- unless $self->site_exists();
-
- $self->set_nsite( $self->get_site() =~ /^(?:\d*\.)?(.*)/ );
-
- $self->set_template( $self->get_defaulttemplate() )
- unless $self->template_exists();
-
- $self->set_style( $self->get_defaultstyle() )
- unless $self->style_exists();
-
- $self->set_proto( $self->get_defaultproto() )
- unless $self->proto_exists();
-
- $self->set_host( lc $ENV{HTTP_HOST} )
- unless $self->host_exists();
-
- unless ( -d $self->get_hostroot() . $self->get_host() ) {
- my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host();
- if ( -f $redirect ) {
- my Xerl::Tools::FileIO $file =
- Xerl::Tools::FileIO->new( 'path' => $redirect );
- $file->fslurp();
- my $location = $file->shift();
- Xerl::Main::Global::REDIRECT($location);
- $self->set_finish_request(1);
- }
- my $alias = $self->get_hostroot() . 'alias:' . $self->get_host();
- if ( -f $alias ) {
- my Xerl::Tools::FileIO $file =
- Xerl::Tools::FileIO->new( 'path' => $alias );
- $file->fslurp();
- $self->set_host( $file->shift() );
- }
- }
+ my Xerl::Page::Configure $self = $_[0];
+
+ $self->set_proto('https') if exists $ENV{HTTPS};
+
+ $self->set_site( $self->get_defaultcontent() )
+ unless $self->site_exists();
+
+ $self->set_nsite( $self->get_site() =~ /^(?:\d*\.)?(.*)/ );
+
+ $self->set_template( $self->get_defaulttemplate() )
+ unless $self->template_exists();
- $self->set_outputformat( $self->get_defaultoutputformat() )
- unless $self->outputformat_exists();
+ $self->set_style( $self->get_defaultstyle() )
+ unless $self->style_exists();
- if ( $self->format_exists() ) {
- $self->set_outputformat( $self->get_format() );
- $self->set_template( $self->get_format() );
- $self->set_site( $self->get_format() );
- $self->set_nocache(1)
- if $self->get_format() =~ /\.feed$/;
+ $self->set_proto( $self->get_defaultproto() )
+ unless $self->proto_exists();
+
+ $self->set_host( lc $ENV{HTTP_HOST} )
+ unless $self->host_exists();
+
+ unless ( -d $self->get_hostroot() . $self->get_host() ) {
+ my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host();
+ if ( -f $redirect ) {
+ my Xerl::Tools::FileIO $file =
+ Xerl::Tools::FileIO->new( 'path' => $redirect );
+ $file->fslurp();
+ my $location = $file->shift();
+ Xerl::Main::Global::REDIRECT($location);
+ $self->set_finish_request(1);
}
+ my $alias = $self->get_hostroot() . 'alias:' . $self->get_host();
+ if ( -f $alias ) {
+ my Xerl::Tools::FileIO $file =
+ Xerl::Tools::FileIO->new( 'path' => $alias );
+ $file->fslurp();
+ $self->set_host( $file->shift() );
+ }
+ }
- $self->set_host( $self->getval( $self->get_host() ) )
- if $self->exists( $self->get_host() );
+ $self->set_outputformat( $self->get_defaultoutputformat() )
+ unless $self->outputformat_exists();
- $self->set_host( $self->getval( $self->get_host() ) )
- if $self->exists( $self->get_host() );
+ if ( $self->format_exists() ) {
+ $self->set_outputformat( $self->get_format() );
+ $self->set_template( $self->get_format() );
+ $self->set_site( $self->get_format() );
+ $self->set_nocache(1)
+ if $self->get_format() =~ /\.feed$/;
+ }
- my $request_subdir = $self->get_request_subdir();
- $self->set_hostpath(
- $self->get_hostroot() . $self->get_host() . $request_subdir . "/" );
+ $self->set_host( $self->getval( $self->get_host() ) )
+ if $self->exists( $self->get_host() );
- $self->set_defaulthostpath(
- $self->get_hostroot() . $self->get_defaulthost() . '/' );
+ $self->set_host( $self->getval( $self->get_host() ) )
+ if $self->exists( $self->get_host() );
- $self->set_cachepath(
- $self->get_cacheroot() . $self->get_host() . $request_subdir . '/' );
+ my $request_subdir = $self->get_request_subdir();
+ $self->set_hostpath(
+ $self->get_hostroot() . $self->get_host() . $request_subdir . "/" );
- $self->set_htdocspath( $self->get_hostpath() . 'htdocs/' );
+ $self->set_defaulthostpath(
+ $self->get_hostroot() . $self->get_defaulthost() . '/' );
- $self->set_templatespath( $self->get_hostpath() . 'templates/' );
+ $self->set_cachepath(
+ $self->get_cacheroot() . $self->get_host() . $request_subdir . '/' );
- $self->set_contentpath( $self->get_hostpath() . 'content/' );
+ $self->set_htdocspath( $self->get_hostpath() . 'htdocs/' );
- # $self->set_ipv6( $ENV{REMOTE_ADDR} =~ /:/ ? 1 : 0 );
+ $self->set_templatespath( $self->get_hostpath() . 'templates/' );
- return undef;
+ $self->set_contentpath( $self->get_hostpath() . 'content/' );
+
+ # $self->set_ipv6( $ENV{REMOTE_ADDR} =~ /:/ ? 1 : 0 );
+
+ return undef;
}
sub eval($$) {
- my Xerl::Page::Configure $self = $_[0];
- my $val = $_[1];
+ my Xerl::Page::Configure $self = $_[0];
+ my $val = $_[1];
- $val =~ s/^!(.+)/`$1`/eo;
- return $val;
+ $val =~ s/^!(.+)/`$1`/eo;
+ return $val;
}
sub insertxmlvars($$) {
- my Xerl::Page::Configure $self = $_[0];
- my Xerl::XML::Element $element = $_[1];
+ my Xerl::Page::Configure $self = $_[0];
+ my Xerl::XML::Element $element = $_[1];
- $element = $element->starttag('variables');
+ $element = $element->starttag('variables');
- return $self
- unless defined $element
- or $element->get_array() eq 'ARRAY';
+ return $self
+ unless defined $element
+ or $element->get_array() eq 'ARRAY';
- my $text;
- for ( @{ $element->get_array() } ) {
- $text = $_->get_text();
- chomp $text;
+ my $text;
+ for ( @{ $element->get_array() } ) {
+ $text = $_->get_text();
+ chomp $text;
- $text =~ s/%%(.*?)%%/$self->getval($1)/eg;
- $self->setval( $_->get_name(), $text );
- }
+ $text =~ s/%%(.*?)%%/$self->getval($1)/eg;
+ $self->setval( $_->get_name(), $text );
+ }
- return $self;
+ return $self;
}
1;
diff --git a/Xerl/Page/Content.pm b/Xerl/Page/Content.pm
index da70139..bd3e8ee 100644
--- a/Xerl/Page/Content.pm
+++ b/Xerl/Page/Content.pm
@@ -40,190 +40,188 @@ use Xerl::Page::Rules;
use Xerl::Page::Configure;
sub parse($) {
- my Xerl::Page::Content $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
+ my Xerl::Page::Content $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
- my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new(
- path => $config->get_templatepath(),
- config => $config
- );
+ my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new(
+ path => $config->get_templatepath(),
+ config => $config
+ );
- if ( -1 == $xmlcontent->open() ) {
- $config->set_finish_request(1);
- return undef;
- }
+ if ( -1 == $xmlcontent->open() ) {
+ $config->set_finish_request(1);
+ return undef;
+ }
- $xmlcontent->parse();
+ $xmlcontent->parse();
- my Xerl::Page::Rules $rules = Xerl::Page::Rules->new( config => $config );
- $rules->parse( $config->get_xmlconfigrootobj() )
- unless $config->exists('noparse');
+ my Xerl::Page::Rules $rules = Xerl::Page::Rules->new( config => $config );
+ $rules->parse( $config->get_xmlconfigrootobj() )
+ unless $config->exists('noparse');
- $config->insertxmlvars( $config->get_xmlconfigrootobj() );
- $self->insertrules( $rules, $xmlcontent->get_root() );
+ $config->insertxmlvars( $config->get_xmlconfigrootobj() );
+ $self->insertrules( $rules, $xmlcontent->get_root() );
- 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];
- # Start inserting rules at <content>
- $element = $element->starttag('content');
+ # Start inserting rules at <content>
+ $element = $element->starttag('content');
- # If there is no <content>-tag, dont use a rule!
- return unless defined $element;
+ # If there is no <content>-tag, dont use a rule!
+ return unless defined $element;
- my @content;
- my $params = $element->get_params();
+ my @content;
+ my $params = $element->get_params();
- unshift @content, "Content-Type: $params->{type}\n\n"
- if ref $params eq 'HASH' and exists $params->{type};
+ unshift @content, "Content-Type: $params->{type}\n\n"
+ if ref $params eq 'HASH' and exists $params->{type};
- push @content, $self->_insertrules( $rules, $element );
- $self->set_content( \@content );
+ 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::Configure $config = $self->get_config();
- my $nonewlines = 0;
-
- #$element->print();
- #
- # Don't interate through the XML childs if we have a leaf node.
- return () unless ref $element->get_array() eq 'ARRAY';
- my ( $name, $rule, @content, $text, $params );
-
- for my $succ ( @{ $element->get_array() } ) {
- $name = $succ->get_name();
- $text = $succ->get_text();
- $params = $succ->get_params();
-
- # Remove leading and ending whitespaces, also ending newlines.
- $text =~ s/^ *(.*)( |\n)*$/$1/g;
- unless ( ref( $rule = $rules->getval($name) ) eq 'ARRAY' ) {
- if ( lc $name eq 'noop' ) {
- if ( ref $succ->get_array() eq 'ARRAY' ) {
- push @content, $self->_insertrules( $rules, $succ );
-
- }
- else {
- push @content, "$text\n";
- }
-
- }
- elsif ( lc $name eq 'tag' ) {
- push @content, "<$text>\n";
-
- }
- elsif ( lc $name eq 'perl' ) {
+ my Xerl::Page::Content $self = $_[0];
+ my Xerl::Page::Rules $rules = $_[1];
+ my Xerl::XML::Element $element = $_[2];
+ my Xerl::Page::Configure $config = $self->get_config();
+ my $nonewlines = 0;
+
+ #$element->print();
+ #
+ # Don't interate through the XML childs if we have a leaf node.
+ return () unless ref $element->get_array() eq 'ARRAY';
+ my ( $name, $rule, @content, $text, $params );
+
+ for my $succ ( @{ $element->get_array() } ) {
+ $name = $succ->get_name();
+ $text = $succ->get_text();
+ $params = $succ->get_params();
+
+ # Remove leading and ending whitespaces, also ending newlines.
+ $text =~ s/^ *(.*)( |\n)*$/$1/g;
+ unless ( ref( $rule = $rules->getval($name) ) eq 'ARRAY' ) {
+ if ( lc $name eq 'noop' ) {
+ if ( ref $succ->get_array() eq 'ARRAY' ) {
+ push @content, $self->_insertrules( $rules, $succ );
+
+ }
+ else {
+ push @content, "$text\n";
+ }
+
+ }
+ elsif ( lc $name eq 'tag' ) {
+ push @content, "<$text>\n";
+
+ }
+ elsif ( lc $name eq 'perl' ) {
# Perl content will be interpreted by Xerl::Page::Templates::print later
- push @content, '<perl>', $text, '</perl>';
-
- }
- elsif ( lc $name eq 'navigation' ) {
- my $menus = $config->get_menuobj()->get_array();
-
- if ( ref $menus eq 'ARRAY' ) {
- push @content, $self->_insertrules( $rules, $_ )
- for @$menus;
- }
-
- }
- else {
-
- # No rule available, use the tag unmodified!
- $name =~ s/^=//o; # Remove the leading =
- if ( $succ->get_single() ) {
- push @content,
- "<$name" . ( $succ->params_str() || '' ) . " />\n"
-
- }
- else {
- push @content,
- "<$name" . ( $succ->params_str() || '' ) . '>',
- $self->_insertrules( $rules, $succ ), $text, "</$name>\n";
- }
- }
+ push @content, '<perl>', $text, '</perl>';
+
+ }
+ elsif ( lc $name eq 'navigation' ) {
+ my $menus = $config->get_menuobj()->get_array();
+ if ( ref $menus eq 'ARRAY' ) {
+ push @content, $self->_insertrules( $rules, $_ ) for @$menus;
}
- else {
- # Get a local copy of lrule, because orule may be modified.
- # And then insert special vars if required:
- # @@text@@ => Text content of the current tag.
+ }
+ else {
- my $ruleparams = $rule->[2];
- $nonewlines = 1 if exists $ruleparams->{nonewlines};
+ # No rule available, use the tag unmodified!
+ $name =~ s/^=//o; # Remove the leading =
+ if ( $succ->get_single() ) {
+ push @content, "<$name" . ( $succ->params_str() || '' ) . " />\n"
- my ( $orule, $crule ) = ( $rule->[0], $rule->[1] );
+ }
+ else {
+ push @content,
+ "<$name" . ( $succ->params_str() || '' ) . '>',
+ $self->_insertrules( $rules, $succ ), $text, "</$name>\n";
+ }
+ }
- $self->_insert_special_vars( $rules, $succ, \$orule );
- $self->_insert_special_vars( $rules, $succ, \$crule );
- chomp $orule;
+ }
+ else {
- # Parse for known tag params.
- if ( ref $params eq 'HASH' ) {
- Xerl::Page::Templates::PARSELINE( $config, '%%', \$text );
+ # Get a local copy of lrule, because orule may be modified.
+ # And then insert special vars if required:
+ # @@text@@ => Text content of the current tag.
- # <tag basename='yes'>path/to/file.bla</tag> => <tag>file.bla</tag>
- $text =~ s#.*/(.*)$#$1# if lc $params->{basename} eq 'yes';
+ my $ruleparams = $rule->[2];
+ $nonewlines = 1 if exists $ruleparams->{nonewlines};
- # <tag cut='?'>foo.bar.tld?options</tag> => <tag>?options</tag>
- if ( exists $params->{cut} ) {
- my $cut = quotemeta $params->{cut};
- $text =~ s/.*$cut(.*)$/$1/o;
- }
+ my ( $orule, $crule ) = ( $rule->[0], $rule->[1] );
- $text .= $params->{addback}
- if exists $params->{addback};
- $text = $params->{addfront} . $text
- if exists $params->{addfront};
- }
+ $self->_insert_special_vars( $rules, $succ, \$orule );
+ $self->_insert_special_vars( $rules, $succ, \$crule );
+ chomp $orule;
- my $oadd =
- exists $ruleparams->{addfront}
- ? '<' . $ruleparams->{addfront}
- : '';
+ # Parse for known tag params.
+ if ( ref $params eq 'HASH' ) {
+ Xerl::Page::Templates::PARSELINE( $config, '%%', \$text );
- my $cadd =
- exists $ruleparams->{addback} ? $ruleparams->{addback} . '>' : '';
+ # <tag basename='yes'>path/to/file.bla</tag> => <tag>file.bla</tag>
+ $text =~ s#.*/(.*)$#$1# if lc $params->{basename} eq 'yes';
- push @content, $orule, $oadd, $self->_insertrules( $rules, $succ ),
- $text, $cadd, $crule;
+ # <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};
+ }
+
+ my $oadd =
+ exists $ruleparams->{addfront}
+ ? '<' . $ruleparams->{addfront}
+ : '';
+
+ my $cadd =
+ exists $ruleparams->{addback} ? $ruleparams->{addback} . '>' : '';
+
+ push @content, $orule, $oadd, $self->_insertrules( $rules, $succ ),
+ $text, $cadd, $crule;
}
+ }
- return $nonewlines ? map { s/\n/ /go; $_ } @content : @content;
+ return $nonewlines ? map { s/\n/ /go; $_ } @content : @content;
}
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::Configure $config = $self->get_config();
- my $rtext = $_[3];
+ my Xerl::Page::Content $self = $_[0];
+ my Xerl::Page::Rules $rules = $_[1];
+ my Xerl::XML::Element $element = $_[2];
+ my Xerl::Page::Configure $config = $self->get_config();
+ my $rtext = $_[3];
- $$rtext =~ s/@\@text\@\@/$_=$element->get_text();chomp;$_/geo;
- $$rtext =~ s/@\@ln\@\@//go;
+ $$rtext =~ s/@\@text\@\@/$_=$element->get_text();chomp;$_/geo;
+ $$rtext =~ s/@\@ln\@\@//go;
- #$$rtext =~ s/@\@link\@\@/$element->get_params()->{link}.'$$params$$'/geo;
+ #$$rtext =~ s/@\@link\@\@/$element->get_params()->{link}.'$$params$$'/geo;
- if ( $$rtext =~ /@\@(.*?)\@\@/ ) {
- my $params = $element->get_params();
- return unless ref $params eq 'HASH';
- $$rtext =~ s/@\@(.*?)\@\@/$params->{$1}||''/geo;
- }
+ if ( $$rtext =~ /@\@(.*?)\@\@/ ) {
+ my $params = $element->get_params();
+ return unless ref $params eq 'HASH';
+ $$rtext =~ s/@\@(.*?)\@\@/$params->{$1}||''/geo;
+ }
- return undef;
+ return undef;
}
1;
diff --git a/Xerl/Page/Document.pm b/Xerl/Page/Document.pm
index bb58016..afc4da3 100644
--- a/Xerl/Page/Document.pm
+++ b/Xerl/Page/Document.pm
@@ -38,38 +38,38 @@ use Xerl::Page::Configure;
use Xerl::Tools::FileIO;
sub parse($) {
- my Xerl::Page::Document $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
+ my Xerl::Page::Document $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
- return undef unless $config->document_exists();
+ return undef unless $config->document_exists();
- my $document = $config->get_document();
- my ($filename) = $document =~ m#([^/]+)$#;
- my ($postfix) = $document =~ /\.(.+)$/;
- my $path;
+ my $document = $config->get_document();
+ my ($filename) = $document =~ m#([^/]+)$#;
+ my ($postfix) = $document =~ /\.(.+)$/;
+ my $path;
- print 'Content-Type: ';
- print $config->getval( 'ctype.' . lc($postfix) ), "\n";
- print "Content-Disposition: attachment; filename=\"$filename\"\n\n";
+ print 'Content-Type: ';
+ print $config->getval( 'ctype.' . lc($postfix) ), "\n";
+ print "Content-Disposition: attachment; filename=\"$filename\"\n\n";
- $path = $config->get_hostpath() . "/htdocs/$document";
- unless ( -f $path ) {
- $path =
- $config->get_hostroot()
- . $config->get_defaulthost()
- . "/htdocs/$document";
- }
+ $path = $config->get_hostpath() . "/htdocs/$document";
+ unless ( -f $path ) {
+ $path =
+ $config->get_hostroot()
+ . $config->get_defaulthost()
+ . "/htdocs/$document";
+ }
- my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( path => $path );
+ my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( path => $path );
- if ( -1 == $io->fslurp() ) {
- $config->set_finish_request(1);
- }
- else {
- $io->print();
- }
+ if ( -1 == $io->fslurp() ) {
+ $config->set_finish_request(1);
+ }
+ else {
+ $io->print();
+ }
- return undef;
+ return undef;
}
1;
diff --git a/Xerl/Page/Menu.pm b/Xerl/Page/Menu.pm
index 0ba9568..3bd158b 100644
--- a/Xerl/Page/Menu.pm
+++ b/Xerl/Page/Menu.pm
@@ -37,95 +37,95 @@ use Xerl::Tools::FileIO;
use Xerl::XML::Element;
sub generate($;$) {
- my Xerl::Page::Menu $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
+ my Xerl::Page::Menu $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
- my @site = split /\//, $config->get_site();
- my @compare = @site;
- my $site = pop @site;
+ my @site = split /\//, $config->get_site();
+ my @compare = @site;
+ my $site = pop @site;
- my ( $content, $siteadd ) = ( 'content/', '' );
+ my ( $content, $siteadd ) = ( 'content/', '' );
- my Xerl::XML::Element $menuelem =
- $self->get_menu( $content, $siteadd, shift @compare );
+ my Xerl::XML::Element $menuelem =
+ $self->get_menu( $content, $siteadd, shift @compare );
+ $self->push_array($menuelem)
+ if $menuelem->first_array()->array_length() > 1;
+
+ for my $s (@site) {
+ $content .= "$s.sub/";
+ $siteadd .= "$s/";
+ $menuelem = $self->get_menu( $content, $siteadd, shift @compare );
$self->push_array($menuelem)
if $menuelem->first_array()->array_length() > 1;
+ }
- for my $s (@site) {
- $content .= "$s.sub/";
- $siteadd .= "$s/";
- $menuelem = $self->get_menu( $content, $siteadd, shift @compare );
- $self->push_array($menuelem)
- if $menuelem->first_array()->array_length() > 1;
- }
-
- return undef;
+ return undef;
}
sub get_menu($$$$) {
- my Xerl::Page::Menu $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
- my ( $content, $siteadd, $compare ) = ( @_[ 1 ... 2 ], lc $_[3] );
- my $issubsection = $content =~ m{\.sub/$};
- my $pattern = qr/\.(?:xml)|(?:sub)$/;
-
- my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new(
- path => $config->get_hostpath() . $content,
- basename => 1,
- );
-
- unless ( $io->exists() ) {
- Xerl::Main::Global::REDIRECT( $config->get_404() );
- $config->set_finish_request(1);
+ my Xerl::Page::Menu $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
+ my ( $content, $siteadd, $compare ) = ( @_[ 1 ... 2 ], lc $_[3] );
+ my $issubsection = $content =~ m{\.sub/$};
+ my $pattern = qr/\.(?:xml)|(?:sub)$/;
+
+ my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new(
+ path => $config->get_hostpath() . $content,
+ basename => 1,
+ );
+
+ unless ( $io->exists() ) {
+ Xerl::Main::Global::REDIRECT( $config->get_404() );
+ $config->set_finish_request(1);
+ }
+
+ $io->dslurp();
+ my $dir = $io->get_array();
+
+ my ( @prec, @dir );
+ map {
+ if (/^\d+\..+\./) { push @prec, $_ }
+ else { push @dir, $_ }
}
+ grep {
+ $_ !~ /^home\.xml$/i
+ && $_ !~ /\.feed\.xml$/i
+ && $_ !~ /\.hide\.xml$/i
+ } @$dir;
- $io->dslurp();
- my $dir = $io->get_array();
+ my Xerl::XML::Element $root = Xerl::XML::Element->new();
+ my Xerl::XML::Element $menu = Xerl::XML::Element->new();
- my ( @prec, @dir );
- map {
- if (/^\d+\..+\./) { push @prec, $_ }
- else { push @dir, $_ }
- }
- grep {
- $_ !~ /^home\.xml$/i
- && $_ !~ /\.feed\.xml$/i
- && $_ !~ /\.hide\.xml$/i
- } @$dir;
+ $menu->set_name('menu');
- my Xerl::XML::Element $root = Xerl::XML::Element->new();
- my Xerl::XML::Element $menu = Xerl::XML::Element->new();
+ for ( $issubsection ? ( @dir, @prec ) : ( 'home.xml', @dir, @prec ) ) {
+ my ($site) = /(.*)$pattern/o;
- $menu->set_name('menu');
+ $site =~ s#\.$#/home#o;
+ $site =~ s/^\d+\.//;
- for ( $issubsection ? ( @dir, @prec ) : ( 'home.xml', @dir, @prec ) ) {
- my ($site) = /(.*)$pattern/o;
+ my $linkname = $site;
+ $linkname =~ s/(?:\d+\.)?(.)/\U$1/o;
+ $compare .= '/' if $linkname =~ s#(.*/)[^/]+$#$1#;
- $site =~ s#\.$#/home#o;
- $site =~ s/^\d+\.//;
-
- my $linkname = $site;
- $linkname =~ s/(?:\d+\.)?(.)/\U$1/o;
- $compare .= '/' if $linkname =~ s#(.*/)[^/]+$#$1#;
-
- my Xerl::XML::Element $item = Xerl::XML::Element->new(
- params => { link => "?site=$siteadd$site" },
- text => $linkname
- );
+ my Xerl::XML::Element $item = Xerl::XML::Element->new(
+ params => { link => "?site=$siteadd$site" },
+ text => $linkname
+ );
- $compare =~ s/^(\d+\.)//;
- $item->set_name(
- lc $linkname eq lc $compare ? 'activemenuitem' : 'menuitem' );
+ $compare =~ s/^(\d+\.)//;
+ $item->set_name(
+ lc $linkname eq lc $compare ? 'activemenuitem' : 'menuitem' );
- $item->set_prev($menu);
- $menu->push_array($item);
- }
+ $item->set_prev($menu);
+ $menu->push_array($item);
+ }
- $root->push_array($menu);
- $menu->set_prev($root);
+ $root->push_array($menu);
+ $menu->set_prev($root);
- return $root;
+ return $root;
}
1;
diff --git a/Xerl/Page/Parameter.pm b/Xerl/Page/Parameter.pm
index 3f580a7..ba0a6cd 100644
--- a/Xerl/Page/Parameter.pm
+++ b/Xerl/Page/Parameter.pm
@@ -38,33 +38,33 @@ use Xerl::Page::Configure;
use Xerl::Tools::FileIO;
sub parse($) {
- my Xerl::Page::Parameter $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
+ my Xerl::Page::Parameter $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
- print "Content-Type: text/plain\n\n"
- if $config->plain_exists();
+ print "Content-Type: text/plain\n\n"
+ if $config->plain_exists();
- if ( $config->href_exists() ) {
- print "Location: ", $config->get_href(), "\n\n";
- $config->set_finish_request(1);
- }
- elsif ( $config->env_exists() ) {
- print "Content-Type: text/plain\n\n";
- print "$_=", $ENV{$_}, "\n" for keys %ENV;
- $config->set_finish_request(1);
- }
+ if ( $config->href_exists() ) {
+ print "Location: ", $config->get_href(), "\n\n";
+ $config->set_finish_request(1);
+ }
+ elsif ( $config->env_exists() ) {
+ print "Content-Type: text/plain\n\n";
+ print "$_=", $ENV{$_}, "\n" for keys %ENV;
+ $config->set_finish_request(1);
+ }
- if ( $config->devel_exists() ) {
- $config->set_nocache(1);
- }
+ if ( $config->devel_exists() ) {
+ $config->set_nocache(1);
+ }
- if ( $config->conf_exists() ) {
- print "Content-Type: text/plain\n\n";
- print "$_=", $config->{$_}, "\n" for keys %$config;
- $config->set_finish_request(1);
- }
+ if ( $config->conf_exists() ) {
+ print "Content-Type: text/plain\n\n";
+ print "$_=", $config->{$_}, "\n" for keys %$config;
+ $config->set_finish_request(1);
+ }
- return $self;
+ return $self;
}
1;
diff --git a/Xerl/Page/Request.pm b/Xerl/Page/Request.pm
index 94c6037..11106ec 100644
--- a/Xerl/Page/Request.pm
+++ b/Xerl/Page/Request.pm
@@ -35,35 +35,35 @@ use warnings;
use Xerl::Base;
sub parse($) {
- my Xerl::Page::Request $self = $_[0];
- my $request = $self->get_request();
+ my Xerl::Page::Request $self = $_[0];
+ my $request = $self->get_request();
- # Secure it!
- $request =~ s#/\.\.##g;
+ # Secure it!
+ $request =~ s#/\.\.##g;
- # Remove last /
- $request =~ s#/$##;
+ # Remove last /
+ $request =~ s#/$##;
- my $request_subdir = $request;
- $request_subdir =~ s#/\?.*##;
- $self->set_request_subdir($request_subdir);
+ my $request_subdir = $request;
+ $request_subdir =~ s#/\?.*##;
+ $self->set_request_subdir($request_subdir);
- # List context returns $1
- ($_) = $request =~ /\?(.+)/;
+ # List context returns $1
+ ($_) = $request =~ /\?(.+)/;
- return $self unless defined;
+ return $self unless defined;
- my $params = '';
- for ( split /&/ ) {
+ my $params = '';
+ for ( split /&/ ) {
- # List context uses ($1,$2) as method args
- $self->setval(/(.+?)=(.+)/);
- $params .= "&amp;$1=$2" if $1 ne 'site';
- }
+ # List context uses ($1,$2) as method args
+ $self->setval(/(.+?)=(.+)/);
+ $params .= "&amp;$1=$2" if $1 ne 'site';
+ }
- $self->set_params($params);
+ $self->set_params($params);
- return undef;
+ return undef;
}
1;
diff --git a/Xerl/Page/Rules.pm b/Xerl/Page/Rules.pm
index 4a08d19..3895f4e 100644
--- a/Xerl/Page/Rules.pm
+++ b/Xerl/Page/Rules.pm
@@ -37,59 +37,59 @@ use Xerl::XML::Element;
use Xerl::Page::Configure;
sub parse($) {
- my Xerl::Page::Rules $self = $_[0];
- my Xerl::XML::Element $element = $_[1];
- my Xerl::Page::Configure $config = $self->get_config();
+ my Xerl::Page::Rules $self = $_[0];
+ my Xerl::XML::Element $element = $_[1];
+ my Xerl::Page::Configure $config = $self->get_config();
- $element = $element->starttag2( 'rules', $config->get_outputformat() );
- return unless defined $element;
+ $element = $element->starttag2( 'rules', $config->get_outputformat() );
+ return unless defined $element;
- # Open and close rules:
- my ( $orule, $crule );
+ # Open and close rules:
+ my ( $orule, $crule );
- # For all available rules in config.xml
- for my $rule ( @{ $element->get_array() } ) {
- my $params = $rule->get_params();
+ # For all available rules in config.xml
+ for my $rule ( @{ $element->get_array() } ) {
+ my $params = $rule->get_params();
- $orule = $rule->get_text();
- chomp $orule;
+ $orule = $rule->get_text();
+ chomp $orule;
- $orule =~ s/\[/</go;
- $orule =~ s/\]/>/go;
+ $orule =~ s/\[/</go;
+ $orule =~ s/\]/>/go;
- unless (
- ref $params eq 'HASH'
- && ( lc $params->{end} eq 'yes'
- || lc $params->{start} eq 'yes' )
- )
- {
- $crule = join '><', reverse split /> *</, $orule;
- $crule = "<$crule>";
- $crule =~ s/<</</go;
- $crule =~ s/>>/>/go;
- $crule =~ s/</<\//go;
- $crule =~ s/\n//go;
- $crule =~ s/ .+?>/>/go;
- $crule .= "\n";
+ unless (
+ ref $params eq 'HASH'
+ && ( lc $params->{end} eq 'yes'
+ || lc $params->{start} eq 'yes' )
+ )
+ {
+ $crule = join '><', reverse split /> *</, $orule;
+ $crule = "<$crule>";
+ $crule =~ s/<</</go;
+ $crule =~ s/>>/>/go;
+ $crule =~ s/</<\//go;
+ $crule =~ s/\n//go;
+ $crule =~ s/ .+?>/>/go;
+ $crule .= "\n";
- }
- else {
- if ( lc $$params{start} eq 'yes' ) {
- $crule = '';
-
- }
- else {
- $crule = $orule;
- $orule = '';
- }
- $crule .= "\n";
- }
+ }
+ else {
+ if ( lc $$params{start} eq 'yes' ) {
+ $crule = '';
- $params = {} unless ref $params eq 'HASH';
- $self->setval( $rule->get_name(), [ "$orule\n", $crule, $params ] );
+ }
+ else {
+ $crule = $orule;
+ $orule = '';
+ }
+ $crule .= "\n";
}
- return undef;
+ $params = {} unless ref $params eq 'HASH';
+ $self->setval( $rule->get_name(), [ "$orule\n", $crule, $params ] );
+ }
+
+ return undef;
}
1;
diff --git a/Xerl/Page/Templates.pm b/Xerl/Page/Templates.pm
index efe7321..3b7d13f 100644
--- a/Xerl/Page/Templates.pm
+++ b/Xerl/Page/Templates.pm
@@ -44,200 +44,198 @@ use Xerl::Tools::FileIO;
use constant RECURSIVE => 1;
sub parse($) {
- my Xerl::Page::Templates $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
+ my Xerl::Page::Templates $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
- my $site = $config->get_site();
+ my $site = $config->get_site();
- my $subpath = $site;
- if ( $site =~ s#^.*/(.*)$#$1#o ) {
- $subpath =~ s#/[^/]+$#/#;
- $subpath =~ s#/#.sub/#go;
+ my $subpath = $site;
+ if ( $site =~ s#^.*/(.*)$#$1#o ) {
+ $subpath =~ s#/[^/]+$#/#;
+ $subpath =~ s#/#.sub/#go;
- }
- else {
- $subpath = '';
- }
+ }
+ else {
+ $subpath = '';
+ }
- my $cachefile =
- $config->get_template() . ';'
- . $config->get_outputformat() . ';'
- . $site
- . ( $config->noparse_exists() ? '.noparse' : '' )
- . '.cache';
+ my $cachefile =
+ $config->get_template() . ';'
+ . $config->get_outputformat() . ';'
+ . $site
+ . ( $config->noparse_exists() ? '.noparse' : '' )
+ . '.cache';
- my $cachepath = $config->get_cachepath() . $subpath;
+ my $cachepath = $config->get_cachepath() . $subpath;
- if ( -f $cachepath . $cachefile
- && ( $config->usecache_exists() or not $config->nocache_exists() ) )
- {
+ if ( -f $cachepath . $cachefile
+ && ( $config->usecache_exists() or not $config->nocache_exists() ) )
+ {
- my Xerl::Tools::FileIO $io =
- Xerl::Tools::FileIO->new( path => $cachepath . $cachefile );
+ my Xerl::Tools::FileIO $io =
+ Xerl::Tools::FileIO->new( path => $cachepath . $cachefile );
- if ( -1 == $io->fslurp() ) {
- $config->set_finish_request(1);
- return undef;
- }
+ if ( -1 == $io->fslurp() ) {
+ $config->set_finish_request(1);
+ return undef;
+ }
- $self->set_array( $io->get_array() );
+ $self->set_array( $io->get_array() );
- }
- else {
- my $xmlconfigpath = $config->get_hostpath() . 'config.xml';
+ }
+ else {
+ my $xmlconfigpath = $config->get_hostpath() . 'config.xml';
- $xmlconfigpath = $config->get_defaulthostpath() . 'config.xml'
- unless -f $xmlconfigpath;
+ $xmlconfigpath = $config->get_defaulthostpath() . 'config.xml'
+ unless -f $xmlconfigpath;
- my Xerl::XML::Reader $xmlconfigreader =
- Xerl::XML::Reader->new( path => $xmlconfigpath, config => $config );
+ my Xerl::XML::Reader $xmlconfigreader =
+ Xerl::XML::Reader->new( path => $xmlconfigpath, config => $config );
- if ( -1 == $xmlconfigreader->open() ) {
- $config->set_finish_request(1);
- return undef;
- }
+ if ( -1 == $xmlconfigreader->open() ) {
+ $config->set_finish_request(1);
+ return undef;
+ }
- $xmlconfigreader->parse();
- $config->set_xmlconfigrootobj( $xmlconfigreader->get_root() );
+ $xmlconfigreader->parse();
+ $config->set_xmlconfigrootobj( $xmlconfigreader->get_root() );
- my Xerl::Page::Menu $menu = Xerl::Page::Menu->new( config => $config );
+ my Xerl::Page::Menu $menu = Xerl::Page::Menu->new( config => $config );
- $menu->generate();
- $config->set_menuobj($menu);
+ $menu->generate();
+ $config->set_menuobj($menu);
- if ( $site =~ /^(\d+)\./ ) {
- $config->set_templatepath(
- $config->get_hostpath() . "content/$subpath$site.xml" );
- }
- elsif ( -f $config->get_hostpath() . "content/$subpath$site.xml" ) {
- $config->set_templatepath(
- $config->get_hostpath() . "content/$subpath$site.xml" );
- }
+ if ( $site =~ /^(\d+)\./ ) {
+ $config->set_templatepath(
+ $config->get_hostpath() . "content/$subpath$site.xml" );
+ }
+ elsif ( -f $config->get_hostpath() . "content/$subpath$site.xml" ) {
+ $config->set_templatepath(
+ $config->get_hostpath() . "content/$subpath$site.xml" );
+ }
- # Hidden files
- elsif ( -f $config->get_hostpath() . "content/$subpath.$site.xml" ) {
- $config->set_templatepath(
- $config->get_hostpath() . "content/$subpath.$site.xml" );
- }
- else {
- my $glob = $config->get_hostpath() . "content/$subpath*.$site.xml";
- eval "(\$glob) = sort <$glob>;";
- $config->set_templatepath($glob);
- }
+ # Hidden files
+ elsif ( -f $config->get_hostpath() . "content/$subpath.$site.xml" ) {
+ $config->set_templatepath(
+ $config->get_hostpath() . "content/$subpath.$site.xml" );
+ }
+ else {
+ my $glob = $config->get_hostpath() . "content/$subpath*.$site.xml";
+ eval "(\$glob) = sort <$glob>;";
+ $config->set_templatepath($glob);
+ }
- my Xerl::Page::Content $bodycontent =
- Xerl::Page::Content->new( config => $config );
+ my Xerl::Page::Content $bodycontent =
+ Xerl::Page::Content->new( config => $config );
- $bodycontent->parse();
+ $bodycontent->parse();
- my $templatepath =
- $config->get_hostpath()
- . "templates/"
- . $config->get_template() . '.xml';
+ my $templatepath =
+ $config->get_hostpath() . "templates/" . $config->get_template() . '.xml';
- $templatepath =
- $config->get_defaulthostpath()
- . "templates/"
- . $config->get_template() . '.xml'
- unless -f $templatepath;
+ $templatepath =
+ $config->get_defaulthostpath()
+ . "templates/"
+ . $config->get_template() . '.xml'
+ unless -f $templatepath;
- $config->set_templatepath($templatepath);
+ $config->set_templatepath($templatepath);
- my Xerl::Page::Content $templatecontent =
- Xerl::Page::Content->new( config => $config );
+ my Xerl::Page::Content $templatecontent =
+ Xerl::Page::Content->new( config => $config );
- $templatecontent->parse();
+ $templatecontent->parse();
- $self->set_array( $templatecontent->get_content() );
- $config->set_content( $bodycontent->get_content() );
- $self->parsetemplate( '%%', RECURSIVE );
+ $self->set_array( $templatecontent->get_content() );
+ $config->set_content( $bodycontent->get_content() );
+ $self->parsetemplate( '%%', RECURSIVE );
- my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new(
- path => $cachepath,
- filename => $cachefile,
- array => $self->get_array(),
- );
+ my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new(
+ path => $cachepath,
+ filename => $cachefile,
+ array => $self->get_array(),
+ );
- $io->fwrite();
- }
+ $io->fwrite();
+ }
- $self->parsetemplate('$$'); # Parsing dynamic vars.
- return undef;
+ $self->parsetemplate('$$'); # Parsing dynamic vars.
+ return undef;
}
sub parsetemplate($$;$) {
- my Xerl::Page::Templates $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
- my $deepnesslevel = $_[2] || 0;
+ my Xerl::Page::Templates $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
+ my $deepnesslevel = $_[2] || 0;
- return $self if $deepnesslevel == 100;
+ return $self if $deepnesslevel == 100;
- my ( $sep, $foundflag ) = quotemeta $_[1];
+ my ( $sep, $foundflag ) = quotemeta $_[1];
- PARSELINE( $config, $sep, \$_, \$foundflag ) for @{ $self->get_array() };
+ PARSELINE( $config, $sep, \$_, \$foundflag ) for @{ $self->get_array() };
- return $self->parsetemplate( $_[1], $deepnesslevel + 1 )
- if defined $deepnesslevel > 0 and $foundflag;
+ return $self->parsetemplate( $_[1], $deepnesslevel + 1 )
+ if defined $deepnesslevel > 0 and $foundflag;
- return undef;
+ return undef;
}
# Static sub
sub PARSELINE($$$;$) {
- my Xerl::Page::Configure $config = $_[0];
- my ( $sep, $line, $foundflag ) = @_[ 1 .. 3 ];
+ my Xerl::Page::Configure $config = $_[0];
+ my ( $sep, $line, $foundflag ) = @_[ 1 .. 3 ];
- $$line =~ s/$sep(!)?(.+?)$sep/
+ $$line =~ s/$sep(!)?(.+?)$sep/
defined $1 ? `$2` :
(ref $config->getval($2) eq 'ARRAY')
? join '', @{$config->getval($2)} :
$config->getval($2)/eg and $$foundflag = 1;
- return undef;
+ return undef;
}
sub print($;$) {
- my Xerl::Page::Templates $self = $_[0];
- my Xerl::Page::Configure $config = $self->get_config();
-
- my ( $code, $flag ) = ( '', 0 );
- my $time = $_[1];
- my $hflag = 1;
-
- for my $line ( @{ $self->get_array() } ) {
- if ( $hflag == 1 && $config->exists('noparse') ) {
- $line =~ s#^Content-Type.*#Content-Type: text/plain#i;
- $hflag = 0;
- }
- $line =~ s/ +/ /g;
- redo if !$flag and $line =~ s/<perl>((?:.|\n)*?)<\/perl>/eval $1/ego;
-
- if ( !$flag and $line =~ s/<perl>(.*)$//o ) {
- $code .= $1;
- $flag = 1;
-
- }
- elsif ( $line =~ s/^(.*?)<\/perl>/eval $code.$1/eo ) {
- ( $code, $flag ) = ( '', 0 );
- redo;
-
- }
- elsif ($flag) {
- $line =~ s/^(.*\n)$//o;
- $code .= $1;
- next;
- }
-
- my $time = defined $time ? sprintf '%1.4f', tv_interval($time) : '';
-
- $line =~ s/!!TIME!!/$time/ge;
- $line =~ s/!!LT!!/</g;
- $line =~ s/!!GT!!/>/g;
- $line =~ s#!!URL\((.+?)\)!!#<a href="$1">$1</a>#g;
- print $line;
+ my Xerl::Page::Templates $self = $_[0];
+ my Xerl::Page::Configure $config = $self->get_config();
+
+ my ( $code, $flag ) = ( '', 0 );
+ my $time = $_[1];
+ my $hflag = 1;
+
+ for my $line ( @{ $self->get_array() } ) {
+ if ( $hflag == 1 && $config->exists('noparse') ) {
+ $line =~ s#^Content-Type.*#Content-Type: text/plain#i;
+ $hflag = 0;
+ }
+ $line =~ s/ +/ /g;
+ redo if !$flag and $line =~ s/<perl>((?:.|\n)*?)<\/perl>/eval $1/ego;
+
+ if ( !$flag and $line =~ s/<perl>(.*)$//o ) {
+ $code .= $1;
+ $flag = 1;
+
}
+ elsif ( $line =~ s/^(.*?)<\/perl>/eval $code.$1/eo ) {
+ ( $code, $flag ) = ( '', 0 );
+ redo;
+
+ }
+ elsif ($flag) {
+ $line =~ s/^(.*\n)$//o;
+ $code .= $1;
+ next;
+ }
+
+ my $time = defined $time ? sprintf '%1.4f', tv_interval($time) : '';
+
+ $line =~ s/!!TIME!!/$time/ge;
+ $line =~ s/!!LT!!/</g;
+ $line =~ s/!!GT!!/>/g;
+ $line =~ s#!!URL\((.+?)\)!!#<a href="$1">$1</a>#g;
+ print $line;
+ }
- return undef;
+ return undef;
}
1;
diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm
index 807cb10..72239ee 100644
--- a/Xerl/Tools/FileIO.pm
+++ b/Xerl/Tools/FileIO.pm
@@ -36,153 +36,153 @@ use Xerl::Base;
use Xerl::Main::Global;
sub dslurp($;$) {
- my Xerl::Tools::FileIO $self = $_[0];
+ my Xerl::Tools::FileIO $self = $_[0];
- my $path = $self->get_path();
+ my $path = $self->get_path();
- $path .= '/' unless $path =~ /\/$/;
- opendir my $dir, $path or Xerl::Main::Global::ERROR( $!, $path, caller() );
+ $path .= '/' unless $path =~ /\/$/;
+ opendir my $dir, $path or Xerl::Main::Global::ERROR( $!, $path, caller() );
- my @dir = sort
- map { $path . $_ }
- grep { /^[^\.]/o } readdir($dir);
+ my @dir = sort
+ map { $path . $_ }
+ grep { /^[^\.]/o } readdir($dir);
- @dir = map { s#.*/([^/]+\..+)$#$1#o; $_ } @dir
- if $self->basename_exists();
+ @dir = map { s#.*/([^/]+\..+)$#$1#o; $_ } @dir
+ if $self->basename_exists();
- closedir $dir;
- $self->set_array( \@dir );
+ closedir $dir;
+ $self->set_array( \@dir );
- return undef;
+ return undef;
}
sub fslurp($) {
- my Xerl::Tools::FileIO $self = $_[0];
- my $path = SECUREPATH( $self->get_path() );
+ my Xerl::Tools::FileIO $self = $_[0];
+ my $path = SECUREPATH( $self->get_path() );
- unless ( -f $path ) {
- Xerl::Main::Global::HTTP( 404, "Not found: $path" );
- return -1;
- }
+ unless ( -f $path ) {
+ Xerl::Main::Global::HTTP( 404, "Not found: $path" );
+ return -1;
+ }
- open my $file, $path or Xerl::Main::Global::ERROR( $!, $path, caller() );
- flock $file, 2;
+ open my $file, $path or Xerl::Main::Global::ERROR( $!, $path, caller() );
+ flock $file, 2;
- my @slurp = <$file>;
+ my @slurp = <$file>;
- flock $file, 3;
- close $file;
+ flock $file, 3;
+ close $file;
- $self->set_array( \@slurp );
+ $self->set_array( \@slurp );
- return 0;
+ return 0;
}
sub exists($) {
- my Xerl::Tools::FileIO $self = $_[0];
- my $path = SECUREPATH( $self->get_path() );
+ my Xerl::Tools::FileIO $self = $_[0];
+ my $path = SECUREPATH( $self->get_path() );
- return -e $path;
+ return -e $path;
}
sub fwrite($) {
- my Xerl::Tools::FileIO $self = $_[0];
- $self->_fwrite(0);
+ my Xerl::Tools::FileIO $self = $_[0];
+ $self->_fwrite(0);
- return undef;
+ return undef;
}
sub fwriteappend($) {
- my Xerl::Tools::FileIO $self = $_[0];
+ my Xerl::Tools::FileIO $self = $_[0];
- $self->_fwrite(1);
+ $self->_fwrite(1);
- return undef;
+ return undef;
}
sub _fwrite($;$) {
- my Xerl::Tools::FileIO $self = $_[0];
- my $append = $_[1];
-
- my ( $path, $filename ) =
- ( SECUREPATH( $self->get_path() ), SECUREPATH( $self->get_filename() ) );
-
- my $path_ = '';
- for ( split /\//, $path ) {
- $path_ .= $_ . '/';
- mkdir $path_
- or Xerl::Main::Global::ERROR( $!, $path_, caller() )
- unless -d $path_;
- }
-
- my $f;
- if ( $append == 0 ) {
- open $f, ">$path$filename"
- or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() );
-
- }
- else {
- open $f, ">>$path$filename"
- or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() );
- }
-
- flock $f, 2;
- print $f @{ $self->get_array() };
- flock $f, 3;
- close $f;
-
- return undef;
+ my Xerl::Tools::FileIO $self = $_[0];
+ my $append = $_[1];
+
+ my ( $path, $filename ) =
+ ( SECUREPATH( $self->get_path() ), SECUREPATH( $self->get_filename() ) );
+
+ my $path_ = '';
+ for ( split /\//, $path ) {
+ $path_ .= $_ . '/';
+ mkdir $path_
+ or Xerl::Main::Global::ERROR( $!, $path_, caller() )
+ unless -d $path_;
+ }
+
+ my $f;
+ if ( $append == 0 ) {
+ open $f, ">$path$filename"
+ or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() );
+
+ }
+ else {
+ open $f, ">>$path$filename"
+ or Xerl::Main::Global::ERROR( $!, $path . $filename, caller() );
+ }
+
+ flock $f, 2;
+ print $f @{ $self->get_array() };
+ flock $f, 3;
+ close $f;
+
+ return undef;
}
sub print($) {
- my Xerl::Tools::FileIO $self = $_[0];
+ my Xerl::Tools::FileIO $self = $_[0];
- print @{ $self->get_array() };
+ print @{ $self->get_array() };
- return undef;
+ return undef;
}
sub reverse_array($) {
- my Xerl::Tools::FileIO $self = $_[0];
+ my Xerl::Tools::FileIO $self = $_[0];
- my @array = reverse @{ $self->get_array() };
- $self->set_array( \@array );
+ my @array = reverse @{ $self->get_array() };
+ $self->set_array( \@array );
- return undef;
+ return undef;
}
sub merge($$) {
- my Xerl::Tools::FileIO( $self, $other ) = @_;
+ my Xerl::Tools::FileIO( $self, $other ) = @_;
- my @merged = ( @{ $self->get_array() }, @{ $other->get_array() } );
- my Xerl::Tools::FileIO $fio = Xerl::Tools::FileIO->new();
+ my @merged = ( @{ $self->get_array() }, @{ $other->get_array() } );
+ my Xerl::Tools::FileIO $fio = Xerl::Tools::FileIO->new();
- $fio->set_array( \@merged );
- return $fio;
+ $fio->set_array( \@merged );
+ return $fio;
}
sub shift($) {
- my Xerl::Tools::FileIO $self = $_[0];
- chomp( my $shift = shift @{ $self->get_array() } );
+ my Xerl::Tools::FileIO $self = $_[0];
+ chomp( my $shift = shift @{ $self->get_array() } );
- return $shift;
+ return $shift;
}
sub pop($) {
- my Xerl::Tools::FileIO $self = $_[0];
- chomp( my $pop = pop @{ $self->get_array() } );
+ my Xerl::Tools::FileIO $self = $_[0];
+ chomp( my $pop = pop @{ $self->get_array() } );
- return $pop;
+ return $pop;
}
use overload '+' => \&merge;
sub SECUREPATH($) {
- my $path = $_[0];
+ my $path = $_[0];
- $path =~ s/\.\.+\/?//g;
+ $path =~ s/\.\.+\/?//g;
- return $path;
+ return $path;
}
1;
diff --git a/Xerl/XML/Element.pm b/Xerl/XML/Element.pm
index 13c963f..ba94807 100644
--- a/Xerl/XML/Element.pm
+++ b/Xerl/XML/Element.pm
@@ -35,77 +35,77 @@ use warnings;
use Xerl::Base;
sub starttag($$) {
- my Xerl::XML::Element $self = $_[0];
- my ( $name, $temp ) = ( $_[1], undef );
+ my Xerl::XML::Element $self = $_[0];
+ my ( $name, $temp ) = ( $_[1], undef );
- return $self if $self->get_name() eq $name;
- return undef if ref $self->get_array() ne 'ARRAY';
+ return $self if $self->get_name() eq $name;
+ return undef if ref $self->get_array() ne 'ARRAY';
- for ( @{ $self->get_array() } ) {
- $temp = $_->starttag($name);
- return $temp if defined $temp;
- }
+ for ( @{ $self->get_array() } ) {
+ $temp = $_->starttag($name);
+ return $temp if defined $temp;
+ }
- return undef;
+ return undef;
}
sub starttag2($$$) {
- my Xerl::XML::Element $self = $_[0];
- my ( $name, $after ) = @_[ 1 ... 2 ];
+ my Xerl::XML::Element $self = $_[0];
+ my ( $name, $after ) = @_[ 1 ... 2 ];
- my Xerl::XML::Element $element = $self->starttag($name);
- return $element->starttag($after) if defined $element;
+ my Xerl::XML::Element $element = $self->starttag($name);
+ return $element->starttag($after) if defined $element;
- return undef;
+ return undef;
}
sub params_str($) {
- my Xerl::XML::Element $self = $_[0];
- my $params = $self->get_params();
+ my Xerl::XML::Element $self = $_[0];
+ my $params = $self->get_params();
- return if $params eq '';
+ return if $params eq '';
- return join '', map { " $_=\"" . $params->{$_} . '"' } keys %$params;
+ return join '', map { " $_=\"" . $params->{$_} . '"' } keys %$params;
}
# Only for testing
sub print($) {
- my Xerl::XML::Element $self = $_[0];
- print $self. "::print(\$)\n";
-
- my $sub;
- $sub = sub {
- my ( $element, $spaceing ) = @_;
- my $spaces = ' ' x $spaceing;
-
- print $spaces, '<', $element->get_name(), ">\n";
- print "$spaces [$_=", _no_newline( $$element{$_} ), "]\n"
- for keys %$element;
-
- #if ($element->exists('params')) {
- if ( $element->params_exists() ) {
- print "$spaces Params:\n";
- while ( my ( $key, $val ) = each %{ $element->get_params() } ) {
- print "$spaces $key=$val\n";
- }
- }
-
- return unless ref $element->get_array() eq 'ARRAY';
- $sub->( $_, $spaceing + 1 ) for @{ $element->get_array() };
- };
-
- $sub->( $self, 0 );
- print $self. "::print(\$)::END\n";
-
- return undef;
+ my Xerl::XML::Element $self = $_[0];
+ print $self. "::print(\$)\n";
+
+ my $sub;
+ $sub = sub {
+ my ( $element, $spaceing ) = @_;
+ my $spaces = ' ' x $spaceing;
+
+ print $spaces, '<', $element->get_name(), ">\n";
+ print "$spaces [$_=", _no_newline( $$element{$_} ), "]\n"
+ for keys %$element;
+
+ #if ($element->exists('params')) {
+ if ( $element->params_exists() ) {
+ print "$spaces Params:\n";
+ while ( my ( $key, $val ) = each %{ $element->get_params() } ) {
+ print "$spaces $key=$val\n";
+ }
+ }
+
+ return unless ref $element->get_array() eq 'ARRAY';
+ $sub->( $_, $spaceing + 1 ) for @{ $element->get_array() };
+ };
+
+ $sub->( $self, 0 );
+ print $self. "::print(\$)::END\n";
+
+ return undef;
}
sub _no_newline($) {
- my $line = $_[0];
+ my $line = $_[0];
- $line =~ s/\n//g;
+ $line =~ s/\n//g;
- return $line;
+ return $line;
}
1;
diff --git a/Xerl/XML/Reader.pm b/Xerl/XML/Reader.pm
index 2562fea..e31ef11 100644
--- a/Xerl/XML/Reader.pm
+++ b/Xerl/XML/Reader.pm
@@ -1,6 +1,6 @@
# Xerl (c) 2005-2011,2013 Dipl.-Inform. (FH) Paul C. Buetow
#
-# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org
+# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org
#
# All rights reserved.
#
@@ -12,8 +12,8 @@
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of buetow.org nor the names of its contributors may
-# be used to endorse or promote products derived from this software
-# without specific prior written permission.
+# be used to endorse or promote products derived from this software
+# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED Paul C. Buetow ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -32,172 +32,136 @@ package Xerl::XML::Reader;
use strict;
use warnings;
+use XML::LibXML;
+
use Xerl::Base;
use Xerl::XML::Element;
+sub newparse($) {
+ my Xerl::XML::Reader $self = shift;
+
+ return undef;
+}
+
sub open($) {
- my Xerl::XML::Reader $self = $_[0];
+ my Xerl::XML::Reader $self = $_[0];
- my Xerl::Tools::FileIO $xmlfile =
- Xerl::Tools::FileIO->new( path => $self->get_path() );
+ my Xerl::Tools::FileIO $xmlfile =
+ Xerl::Tools::FileIO->new( path => $self->get_path() );
- return -1 if -1 == $xmlfile->fslurp();
- $self->set_array( $xmlfile->get_array() );
+ return -1 if -1 == $xmlfile->fslurp();
+ $self->set_array( $xmlfile->get_array() );
- return 0;
+ return 0;
}
sub parse($) {
- my Xerl::XML::Reader $self = $_[0];
-
- my $rarray = $self->get_array();
- return $self unless ref $rarray eq 'ARRAY';
-
- my Xerl::XML::Element $element = Xerl::XML::Element->new();
- my Xerl::XML::Element( $root, $next, $prev, $insert );
-
- # Prove and remove XML Header.
- Xerl::Main::Global::ERROR( 'No valid XML header', caller() )
- unless $rarray->[0] =~ s/<\?xml .*?version.+?\?>//io;
-
- my ( $newlineadd, $linecount, $notrim ) = ( 0, 0, 0 );
-
- #for my $line (@$rarray) {
- for my $line (@$rarray) {
- $newlineadd = 1 if length $line == 1 and $linecount > 3;
- ++$linecount;
-
- $line =~ s/\\</!!LT!!/g;
- $line =~ s/\\>/!!GT!!/g;
-
- # Allow <tag />
- my $is_single_tag = $line =~ s#<([^/].+?)( (.*?))? ?/ *>#<$1 $3></$1>#o;
-
- my $flag = 0;
-
- do {
-
- # Open XML tag
- if ( $line =~ s#<([^/].+?)( (.*?))? *>##o ) {
- my ( $name, $params ) = ( $1, $3 );
- $flag = 1;
-
- # Ignore XML comments
- next if $name =~ /^!--/o;
-
- $next = Xerl::XML::Element->new();
- $next->set_name($name);
- $next->set_prev($element);
- $next->set_single($is_single_tag);
-
- # Handle tag parameters
- if ( defined $params ) {
- my %params = $params =~ /
- (?: ( [^\s]+? ) \s*=\s* (
- (?: '(?:.|(?:\\'))*?' ) |
- (?: "(?:.|(?:\\"))*?" ) |
- (?: [^\s]+ ) ) )
- /gox;
-
- # Remove " and '
- $params{$_} =~ s/^(?:"|')|(?:"|')$//go for keys %params;
- $next->set_params( \%params );
- $notrim = 1 if exists $params{notrim};
- }
-
- $element->push_array($next);
-
- $root = $element unless defined $root;
- $element = $next;
- $insert = $element;
-
- redo;
- }
-
- # Close XML tag
- if ( $line =~ s#<(/.+?)>##o ) {
- $flag = 1;
-
- #print "XML::<$1>\n";
- if ( $element->get_name() eq 'includefiles' ) {
- my $config = $self->get_config();
- my $params = $element->get_params();
- my $path =
- $config->get_hostpath() . 'content/' . $params->{reldir};
- my $pattern = $params->{pattern};
- my $maxitems =
- exists $params->{maxitems} ? $params->{maxitems} : 100;
- my $startindex =
- exists $params->{startindex} ? $params->{startindex} : 0;
-
- my Xerl::Tools::FileIO $io =
- Xerl::Tools::FileIO->new( path => $path );
-
- $io->dslurp();
- $io->reverse_array() if exists $params->{reversed};
-
- for
- my $include ( grep { /$pattern/o } @{ $io->get_array() } )
- {
- last unless $maxitems--;
- next if 0 < $startindex--;
-
- my Xerl::XML::Reader $reader = Xerl::XML::Reader->new(
- path => $include,
- config => $config
- );
-
- if ( -1 == $reader->open() ) {
- $config->set_finish_request(1);
- return undef;
- }
- $reader->parse();
-
- my Xerl::XML::Element $starttag =
- $reader->get_root()->starttag('content');
-
- my $sep =
- exists $params->{separator}
- ? $params->{separator}
- : 'noop';
- $starttag->set_name($sep);
- $element->set_name('noop');
- $element->push_array($starttag);
- }
- }
-
- $insert = $element;
- $prev = $element->get_prev();
- $element = $prev if defined $prev;
- $notrim = 0 if $notrim;
-
- redo;
- }
-
- # XML text
- if ( defined $insert
- and $line =~ s/^( *)(.+?) *$/$notrim ? $1.$2 : $2/oe )
- {
-
- if ($newlineadd) {
- $insert->append_text("\n");
- $newlineadd = 0;
- }
-
- $line =~ s/!!LT!!/</g;
- $line =~ s/!!GT!!/>/g;
-
- $insert->append_text($line);
- }
- } while ( $flag == 1 );
- }
-
- $root->set_name('root');
-
- # $root->print();
- $self->set_root($root);
-
- return undef;
+ my Xerl::XML::Reader $self = $_[0];
+
+ $self->newparse( $self->get_path() );
+
+ my $rarray = $self->get_array();
+ return $self unless ref $rarray eq 'ARRAY';
+
+ my Xerl::XML::Element $element = Xerl::XML::Element->new();
+ my Xerl::XML::Element( $root, $next, $prev, $insert );
+
+ # Prove and remove XML Header.
+ Xerl::Main::Global::ERROR( 'No valid XML header', caller() )
+ unless $rarray->[0] =~ s/<\?xml .*?version.+?\?>//io;
+
+ my ( $newlineadd, $linecount, $notrim ) = ( 0, 0, 0 );
+
+ #for my $line (@$rarray) {
+ for my $line (@$rarray) {
+ $newlineadd = 1 if length $line == 1 and $linecount > 3;
+ ++$linecount;
+
+ $line =~ s/\\</!!LT!!/g;
+ $line =~ s/\\>/!!GT!!/g;
+
+ # Allow <tag />
+ my $is_single_tag = $line =~ s#<([^/].+?)( (.*?))? ?/ *>#<$1 $3></$1>#o;
+
+ my $flag = 0;
+
+ do {
+
+ # Open XML tag
+ if ( $line =~ s#<([^/].+?)( (.*?))? *>##o ) {
+ my ( $name, $params ) = ( $1, $3 );
+ $flag = 1;
+
+ # Ignore XML comments
+ next if $name =~ /^!--/o;
+
+ $next = Xerl::XML::Element->new();
+ $next->set_name($name);
+ $next->set_prev($element);
+ $next->set_single($is_single_tag);
+
+ # Handle tag parameters
+ if ( defined $params ) {
+ my %params = $params =~ /
+ (?: ( [^\s]+? ) \s*=\s* (
+ (?: '(?:.|(?:\\'))*?' ) |
+ (?: "(?:.|(?:\\"))*?" ) |
+ (?: [^\s]+ ) ) )
+ /gox;
+
+ # Remove " and '
+ $params{$_} =~ s/^(?:"|')|(?:"|')$//go for keys %params;
+ $next->set_params( \%params );
+ $notrim = 1 if exists $params{notrim};
+ }
+
+ $element->push_array($next);
+
+ $root = $element unless defined $root;
+ $element = $next;
+ $insert = $element;
+
+ redo;
+ }
+
+ # Close XML tag
+ if ( $line =~ s#<(/.+?)>##o ) {
+ $flag = 1;
+
+ #print "XML::<$1>\n";
+
+ $insert = $element;
+ $prev = $element->get_prev();
+ $element = $prev if defined $prev;
+ $notrim = 0 if $notrim;
+
+ redo;
+ }
+
+ # XML text
+ if ( defined $insert
+ and $line =~ s/^( *)(.+?) *$/$notrim ? $1.$2 : $2/oe )
+ {
+
+ if ($newlineadd) {
+ $insert->append_text("\n");
+ $newlineadd = 0;
+ }
+
+ $line =~ s/!!LT!!/</g;
+ $line =~ s/!!GT!!/>/g;
+
+ $insert->append_text($line);
+ }
+ } while ( $flag == 1 );
+ }
+
+ $root->set_name('root');
+
+ # $root->print();
+ $self->set_root($root);
+
+ return undef;
}
1;
diff --git a/index.fpl b/index.fpl
index 11be5fc..d13cd6f 100755
--- a/index.fpl
+++ b/index.fpl
@@ -16,6 +16,6 @@ my $config =
: ( -e "xerl-$host.conf" ? "xerl-$host.conf" : 'config.conf' );
while ( FCGI::accept >= 0 ) {
- my Xerl $xerl = Xerl->new( config => $config );
- $xerl->run();
+ my Xerl $xerl = Xerl->new( config => $config );
+ $xerl->run();
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-02 12:43:54 +0000