From b16cca8b3944c071a15ba57820804cfb6da9cbdb Mon Sep 17 00:00:00 2001 From: "Chuck Norris (mars.fritz.box)" Date: Thu, 28 Aug 2014 09:33:11 +0200 Subject: refactor --- Xerl/XML/Element.pm | 17 ++++++++--------- Xerl/XML/Reader.pm | 12 +++++------- Xerl/XML/SAXHandler.pm | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) (limited to 'Xerl/XML') diff --git a/Xerl/XML/Element.pm b/Xerl/XML/Element.pm index 0867841..f1f79fd 100644 --- a/Xerl/XML/Element.pm +++ b/Xerl/XML/Element.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 # @@ -12,8 +12,8 @@ use warnings; use Xerl::Base; -sub starttag($$) { - my Xerl::XML::Element $self = $_[0]; +sub starttag { + my $self = $_[0]; my ( $name, $temp ) = ( $_[1], undef ); return $self if $self->get_name() eq $name; @@ -27,22 +27,21 @@ sub starttag($$) { return undef; } -sub starttag2($$$) { - my Xerl::XML::Element $self = $_[0]; +sub starttag2 { + my $self = $_[0]; my ( $name, $after ) = @_[ 1 ... 2 ]; - my Xerl::XML::Element $element = $self->starttag($name); + my $element = $self->starttag($name); return $element->starttag($after) if defined $element; return undef; } -sub params_str($) { - my Xerl::XML::Element $self = $_[0]; +sub params_str { + my $self = $_[0]; my $params = $self->get_params(); return undef if $params eq ''; - return join '', map { " $_=\"" . $params->{$_} . '"' } keys %$params; } diff --git a/Xerl/XML/Reader.pm b/Xerl/XML/Reader.pm index ae5a07b..88c727a 100644 --- a/Xerl/XML/Reader.pm +++ b/Xerl/XML/Reader.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 # @@ -18,8 +18,8 @@ use Xerl::Base; use Xerl::XML::Element; use Xerl::XML::SAXHandler; -sub open($) { - my Xerl::XML::Reader $self = shift; +sub open { + my $self = shift; if ( -f $self->get_path() ) { return 0; @@ -29,14 +29,12 @@ sub open($) { } } -sub parse() { - my Xerl::XML::Reader $self = shift; +sub parse { + my $self = shift; my $sax_handler = Xerl::XML::SAXHandler->new(); my $parser = XML::SAX::ParserFactory->parser( Handler => $sax_handler ); - $parser->parse_uri( $self->get_path() ); - $self->set_root( $sax_handler->{xerl}{root} ); return undef; diff --git a/Xerl/XML/SAXHandler.pm b/Xerl/XML/SAXHandler.pm index 9ba7729..b168c5f 100644 --- a/Xerl/XML/SAXHandler.pm +++ b/Xerl/XML/SAXHandler.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 # -- cgit v1.2.3