Split out the TemplateSAX modules into separate files.

[xml-template] / perl-sax / XML / TemplateSAX.pm

diff --git a/perl-sax/XML/TemplateSAX.pm b/perl-sax/XML/TemplateSAX.pm
index d2eb7a5bc1ead16e97b04f909f5a97b34826909c..65f8d226cac07f63fc3d79c395a943fa872a1e20 100644 (file)
--- a/perl-sax/XML/TemplateSAX.pm
+++ b/perl-sax/XML/TemplateSAX.pm
@@ -17,111 +17,29 @@
 
 use XML::SAX::Expat;
 use XML::SAX::Writer;
-use Data::Dumper;
-
-package XML::TemplateSAX::Handler;
-use base qw(XML::SAX::Base);
-
-sub new {
-       my $class = shift;
-       my %options = @_;
-
-       my $self = {
-               obj => $options{'Content'},
-               stack => [],
-               Handler => $options{'Handler'}
-       };
-       bless($self, $class);
-       return $self;
-}
-
-sub start_element {
-       my ($self, $data) = @_;
-       my $obj = $self->{'obj'};
-
-       # within a replacement; just ignore everything  
-       return if (!defined($obj));
-
-       # substitution: see if this element matches anything. if so,
-       # descend down into the tree.
-       if (ref($obj) eq 'HASH') {
-               my $match = undef;
-               for my $key (keys %$obj) {
-                       if ($key =~ /^#(.*)$/) {
-                               if ($data->{'NamespaceURI'} eq 'http://template.sesse.net/' && $data->{'LocalName'} eq $1) {
-                                       $match = $obj->{$key};
-                                       last;
-                               }
-                       } else {
-                               if ($data->{'LocalName'} eq $key) {
-                                       $match = $obj->{$key};
-                                       last;
-                               }
-                       }
-               }
-
-               if (defined($match)) {
-                       $self->SUPER::start_element($data);
-
-                       push @{$self->{'stack'}}, [ $data->{'Name'}, $obj ];
-                       
-                       #
-                       # This is sort of ugly. We special-case replacement by outputting
-                       # the string immediately, and then just ignoring the rest of the
-                       # events until we get to the right end tag. It's not 100% technically
-                       # correct for the case where you replace an entire document by a
-                       # string, but that's nonsensical anyway.
-                       #
-                       if (!ref($match)) {
-                               $self->SUPER::characters({ Data => $match });
-                               $match = undef;
-                       }
-
-                       $self->{'obj'} = $match;
-                       return;
-               }
-       }
-       
-       $self->SUPER::start_element($data);
-}
-
-sub characters {
-       my ($self, $data) = @_;
-       return if (!defined($self->{'obj'}));
-       $self->SUPER::characters($data);
-}
-
-sub end_element {
-       my ($self, $data) = @_;
-
-       my $stack = $self->{'stack'};
-       if (scalar @$stack > 0) {
-               my $top = $stack->[$#stack];
-               
-               if ($data->{'Name'} eq $top->[0]) {
-                       $self->SUPER::end_element($data);
-                       $self->{'obj'} = $top->[1];
-                       pop @$stack;
-                       return;
-               }
-       }
-       
-       return if (!defined($self->{'obj'}));
-
-       $self->SUPER::end_element($data);
-}
+use XML::TemplateSAX::Cleaner;
+use XML::TemplateSAX::Handler;
 
 package XML::TemplateSAX;
 
 sub process_file {
        my ($filename, $obj, $clean) = @_;
+       $clean = 1 unless (defined($clean));
 
+       my ($writer, $cleaner, $filter, $parser);
        my $str = '';
 
        # FIXME: hardcoding expat = not good?
-       my $writer = XML::SAX::Writer->new(Output => \$str);
-       my $filter = XML::TemplateSAX::Handler->new(Handler => $writer, Content => $obj);
-       my $parser = XML::SAX::Expat->new(Handler => $filter);
+       $writer = XML::SAX::Writer->new(Output => \$str);
+
+       if ($clean) {
+               $cleaner = XML::TemplateSAX::Cleaner->new(Handler => $writer, Content => $obj);
+               $filter = XML::TemplateSAX::Handler->new(Handler => $cleaner, Content => $obj);
+       } else {
+               $filter = XML::TemplateSAX::Handler->new(Handler => $writer, Content => $obj);
+       }
+
+       $parser = XML::SAX::Expat->new(Handler => $filter);
        $parser->parse_file($filename);
 
        return $str;