Add deferred parsing for perl-sax. Doesn't work yet, though, so it uses

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

diff --git a/perl-sax/XML/TemplateSAX/Handler.pm b/perl-sax/XML/TemplateSAX/Handler.pm
index a0a40b2558ac76cc56014c0c4e3f8028d11295a4..319883bfd6ad883938bbab26d64a42bc5d6352ed 100644 (file)
--- a/perl-sax/XML/TemplateSAX/Handler.pm
+++ b/perl-sax/XML/TemplateSAX/Handler.pm
@@ -14,6 +14,7 @@ sub new {
        my $self = {
                obj => $options{'Content'},
                stack => [],
+               level => 0,
                Handler => $options{'Handler'}
        };
        bless($self, $class);
@@ -24,6 +25,8 @@ sub start_element {
        my ($self, $data) = @_;
        my $obj = $self->{'obj'};
 
+       ++$self->{'level'};
+
        # find the ID, if any
        my $id = $data->{'Attributes'}->{'{http://template.sesse.net/}id'};
        $id = $id->{'Value'} if (defined($id));
@@ -40,6 +43,23 @@ sub start_element {
        # substitution: see if this element matches anything. if so,
        # descend down into the tree.
        if (ref($obj) eq 'HASH') {
+               # first of all, see if we have an attribute match.
+               for my $key (keys %$obj) {
+                       next unless ($key =~ /^(#?)(.*)\/(.*)$/);
+                       my ($idmarker, $name, $attr) = ($1, $2, $3);
+
+                       if (($idmarker eq '#' && $id eq $name) ||
+                           ($idmarker ne '#' && $data->{'LocalName'} eq $name)) {
+                               $data->{'Attributes'}->{$attr} = {
+                                       Prefix => '',
+                                       LocalName => $attr,
+                                       Name => $attr,
+                                       NamespaceURI => '',
+                                       Value => $obj->{$key}
+                               };
+                       }
+               }
+
                my $match = undef;
                for my $key (keys %$obj) {
                        if ($key =~ /^#(.*)$/) {
@@ -58,8 +78,7 @@ sub start_element {
                if (defined($match)) {
                        $self->SUPER::start_element($data);
                
-                       # FIXME: we should match on something better than the name. But what?
-                       push @{$self->{'stack'}}, [ $data->{'Name'}, $obj ];
+                       push @{$self->{'stack'}}, [ $self->{'level'}, $obj ];
 
                        #
                        # This is sort of ugly. We special-case replacement by outputting
@@ -94,9 +113,12 @@ sub start_element {
                        if (ref($match) eq 'XML::TemplateSAX::Buffer') {
                                $match->replay($self);
                                $self->{'obj'} = undef;
+                       } elsif (ref($match) eq 'XML::TemplateSAX::Deferred') {
+                               $match->parse($self);
+                               $self->{'obj'} = undef;
+                       } else {
+                               $self->{'obj'} = $match;
                        }
-                       
-                       $self->{'obj'} = $match;
                        return;
                }
        }
@@ -146,12 +168,12 @@ sub processing_instruction {
 
 sub end_element {
        my ($self, $data) = @_;
-
+       
        my $stack = $self->{'stack'};
        if (scalar @$stack > 0) {
                my $top = $stack->[scalar @$stack - 1];
                
-               if ($data->{'Name'} eq $top->[0]) {
+               if ($self->{'level'} == $top->[0]) {
                        my $obj = $self->{'obj'};
 
                        # did we just finish a clone operation?
@@ -165,10 +187,13 @@ sub end_element {
                        $self->SUPER::end_element($data);
                        $self->{'obj'} = $top->[1];
                        pop @$stack;
+                       --$self->{'level'};
                        return;
                }
        }
        
+       --$self->{'level'};
+       
        return if (!defined($self->{'obj'}));
        
        if (ref($self->{'obj'}) eq 'XML::TemplateSAX::Buffer') {