summaryrefslogtreecommitdiff
path: root/Xerl/Page
diff options
context:
space:
mode:
Diffstat (limited to 'Xerl/Page')
-rw-r--r--Xerl/Page/Content.pm44
-rw-r--r--Xerl/Page/Document.pm10
-rw-r--r--Xerl/Page/Menu.pm25
-rw-r--r--Xerl/Page/Rules.pm10
-rw-r--r--Xerl/Page/Templates.pm40
5 files changed, 61 insertions, 68 deletions
diff --git a/Xerl/Page/Content.pm b/Xerl/Page/Content.pm
index e2dd045..05a206d 100644
--- a/Xerl/Page/Content.pm
+++ b/Xerl/Page/Content.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
#
# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org
#
@@ -22,11 +22,11 @@ use Xerl::XML::Reader;
use LWP::Simple;
-sub parse($) {
- my Xerl::Page::Content $self = $_[0];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+ my $self = $_[0];
+ my $config = $self->get_config();
- my Xerl::XML::Reader $xmlcontent = Xerl::XML::Reader->new(
+ my $xmlcontent = Xerl::XML::Reader->new(
path => $config->get_templatepath(),
config => $config
);
@@ -38,7 +38,7 @@ sub parse($) {
$xmlcontent->parse();
- my Xerl::Page::Rules $rules = Xerl::Page::Rules->new( config => $config );
+ my $rules = Xerl::Page::Rules->new( config => $config );
$rules->parse( $config->get_xmlconfigrootobj() )
unless $config->exists('noparse');
@@ -48,10 +48,10 @@ sub parse($) {
return undef;
}
-sub insertrules($$$$) {
- my Xerl::Page::Content $self = $_[0];
- my Xerl::Page::Rules $rules = $_[1];
- my Xerl::XML::Element $element = $_[2];
+sub insertrules {
+ my $self = $_[0];
+ my $rules = $_[1];
+ my $element = $_[2];
# Start inserting rules at <content>
$element = $element->starttag('content');
@@ -71,12 +71,12 @@ sub insertrules($$$$) {
return undef;
}
-sub _insertrules($$$) {
- 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;
+sub _insertrules {
+ my $self = $_[0];
+ my $rules = $_[1];
+ my $element = $_[2];
+ my $config = $self->get_config();
+ my $nonewlines = 0;
# Don't interate through the XML childs if we have a leaf node.
return () unless ref $element->get_array() eq 'ARRAY';
@@ -201,12 +201,12 @@ sub _insertrules($$$) {
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::Setup::Configure $config = $self->get_config();
- my $rtext = $_[3];
+sub _insert_special_vars {
+ my $self = $_[0];
+ my $rules = $_[1];
+ my $element = $_[2];
+ my $rtext = $_[3];
+ my $config = $self->get_config();
$$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 89ae788..b7cafa3 100644
--- a/Xerl/Page/Document.pm
+++ b/Xerl/Page/Document.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
#
# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org
#
@@ -17,9 +17,9 @@ use Xerl::Main::Global;
use Xerl::Setup::Configure;
use Xerl::Tools::FileIO;
-sub parse($) {
- my Xerl::Page::Document $self = $_[0];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+ my $self = $_[0];
+ my $config = $self->get_config();
return undef unless $config->document_exists();
@@ -40,7 +40,7 @@ sub parse($) {
. "/htdocs/$document";
}
- my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new( path => $path );
+ my $io = Xerl::Tools::FileIO->new( path => $path );
if ( -1 == $io->fslurp() ) {
$config->set_finish_request(1);
diff --git a/Xerl/Page/Menu.pm b/Xerl/Page/Menu.pm
index a813461..987c13a 100644
--- a/Xerl/Page/Menu.pm
+++ b/Xerl/Page/Menu.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
#
# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org
#
@@ -17,9 +17,9 @@ use Xerl::Setup::Configure;
use Xerl::Tools::FileIO;
use Xerl::XML::Element;
-sub generate($;$) {
- my Xerl::Page::Menu $self = $_[0];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub generate {
+ my $self = $_[0];
+ my $config = $self->get_config();
my @site = split /\//, $config->get_site();
my @compare = @site;
@@ -27,8 +27,7 @@ sub generate($;$) {
my ( $content, $siteadd ) = ( 'content/', '' );
- my Xerl::XML::Element $menuelem =
- $self->get_menu( $content, $siteadd, shift @compare );
+ my $menuelem = $self->get_menu( $content, $siteadd, shift @compare );
$self->push_array($menuelem)
if $menuelem->first_array()->array_length() > 1;
@@ -45,15 +44,15 @@ sub generate($;$) {
return undef;
}
-sub get_menu($$$$) {
- my Xerl::Page::Menu $self = $_[0];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub get_menu {
+ my $self = $_[0];
+ my $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(
+ my $io = Xerl::Tools::FileIO->new(
path => $config->get_hostpath() . $content,
basename => 1,
);
@@ -78,8 +77,8 @@ sub get_menu($$$$) {
&& $_ !~ /\.inc\.pl$/i
} @$dir;
- my Xerl::XML::Element $root = Xerl::XML::Element->new();
- my Xerl::XML::Element $menu = Xerl::XML::Element->new();
+ my $root = Xerl::XML::Element->new();
+ my $menu = Xerl::XML::Element->new();
$menu->set_name('menu');
@@ -93,7 +92,7 @@ sub get_menu($$$$) {
$linkname =~ s/(?:\d+\.)?(.)/\U$1/o;
$compare .= '/' if $linkname =~ s#(.*/)[^/]+$#$1#;
- my Xerl::XML::Element $item = Xerl::XML::Element->new(
+ my $item = Xerl::XML::Element->new(
params => { link => "?site=$siteadd$site" },
text => $linkname
);
diff --git a/Xerl/Page/Rules.pm b/Xerl/Page/Rules.pm
index 6a59285..0d08a67 100644
--- a/Xerl/Page/Rules.pm
+++ b/Xerl/Page/Rules.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
#
# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org
#
@@ -16,10 +16,10 @@ use Xerl::Base;
use Xerl::Setup::Configure;
use Xerl::XML::Element;
-sub parse($) {
- my Xerl::Page::Rules $self = $_[0];
- my Xerl::XML::Element $element = $_[1];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+ my $self = $_[0];
+ my $element = $_[1];
+ my $config = $self->get_config();
$element = $element->starttag2( 'rules', $config->get_outputformat() );
return unless defined $element;
diff --git a/Xerl/Page/Templates.pm b/Xerl/Page/Templates.pm
index d18ebcb..a2b2880 100644
--- a/Xerl/Page/Templates.pm
+++ b/Xerl/Page/Templates.pm
@@ -1,4 +1,4 @@
-# Xerl (c) 2005-2011, 2013, 2014 Dipl.-Inform. (FH) Paul C. Buetow
+# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow
#
# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org
#
@@ -23,9 +23,9 @@ use Xerl::Tools::FileIO;
use constant RECURSIVE => 1;
-sub parse($) {
- my Xerl::Page::Templates $self = $_[0];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub parse {
+ my $self = $_[0];
+ my $config = $self->get_config();
my $site = $config->get_site();
@@ -52,8 +52,7 @@ sub parse($) {
&& ( $config->usecache_exists() or not $config->nocache_exists() ) )
{
- my Xerl::Tools::FileIO $io =
- Xerl::Tools::FileIO->new( path => $cachepath . $cachefile );
+ my $io = Xerl::Tools::FileIO->new( path => $cachepath . $cachefile );
if ( -1 == $io->fslurp() ) {
$config->set_finish_request(1);
@@ -69,7 +68,7 @@ sub parse($) {
$xmlconfigpath = $config->get_defaulthostpath() . 'config.xml'
unless -f $xmlconfigpath;
- my Xerl::XML::Reader $xmlconfigreader =
+ my $xmlconfigreader =
Xerl::XML::Reader->new( path => $xmlconfigpath, config => $config );
if ( -1 == $xmlconfigreader->open() ) {
@@ -80,8 +79,7 @@ sub parse($) {
$xmlconfigreader->parse();
$config->set_xmlconfigrootobj( $xmlconfigreader->get_root() );
- my Xerl::Page::Menu $menu = Xerl::Page::Menu->new( config => $config );
-
+ my $menu = Xerl::Page::Menu->new( config => $config );
$menu->generate();
$config->set_menuobj($menu);
@@ -105,9 +103,7 @@ sub parse($) {
$config->set_templatepath($glob);
}
- my Xerl::Page::Content $bodycontent =
- Xerl::Page::Content->new( config => $config );
-
+ my $bodycontent = Xerl::Page::Content->new( config => $config );
$bodycontent->parse();
my $templatepath =
@@ -121,16 +117,14 @@ sub parse($) {
$config->set_templatepath($templatepath);
- my Xerl::Page::Content $templatecontent =
- Xerl::Page::Content->new( config => $config );
-
+ my $templatecontent = Xerl::Page::Content->new( config => $config );
$templatecontent->parse();
$self->set_array( $templatecontent->get_content() );
$config->set_content( $bodycontent->get_content() );
$self->parsetemplate( '%%', RECURSIVE );
- my Xerl::Tools::FileIO $io = Xerl::Tools::FileIO->new(
+ my $io = Xerl::Tools::FileIO->new(
path => $cachepath,
filename => $cachefile,
array => $self->get_array(),
@@ -143,9 +137,9 @@ sub parse($) {
return undef;
}
-sub parsetemplate($$;$) {
- my Xerl::Page::Templates $self = $_[0];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub parsetemplate {
+ my $self = $_[0];
+ my $config = $self->get_config();
my $deepnesslevel = $_[2] || 0;
return $self if $deepnesslevel == 100;
@@ -160,9 +154,9 @@ sub parsetemplate($$;$) {
return undef;
}
-sub print($;$) {
- my Xerl::Page::Templates $self = $_[0];
- my Xerl::Setup::Configure $config = $self->get_config();
+sub print {
+ my $self = $_[0];
+ my $config = $self->get_config();
my ( $code, $flag ) = ( '', 0 );
my $time = $_[1];
@@ -210,7 +204,7 @@ sub print($;$) {
# Static sub
sub PARSELINE($$$;$) {
- my Xerl::Setup::Configure $config = $_[0];
+ my $config = $_[0];
my ( $sep, $line, $foundflag ) = @_[ 1 .. 3 ];
$$line =~ s/$sep(!)?(.+?)$sep/