Fix some internal oddities in perl-sax/structure; however, the test still

[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 eb10ac6b3e81b58bcf24d33a2e9007514ec667f1..b7917bc7979b2101156ab4525f3d6c5ff405cf74 100644 (file)
--- a/perl-sax/XML/TemplateSAX/Handler.pm
+++ b/perl-sax/XML/TemplateSAX/Handler.pm
@@ -23,23 +23,31 @@ sub new {
 sub start_element {
        my ($self, $data) = @_;
        my $obj = $self->{'obj'};
-
+       
        # find the ID, if any
        my $id = $data->{'Attributes'}->{'{http://template.sesse.net/}id'};
        $id = $id->{'Value'} if (defined($id));
 
-       # within a replacement; just ignore everything  
-       return if (!defined($obj));
-
-       # within a cloning; slurp it up
-       if (ref($obj) eq 'XML::TemplateSAX::Buffer') {
-               $obj->start_element($data);
-               return;
-       }
-
        # 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 +66,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'}}, [ $data->{'Name'}, 0, $obj ];
 
                        #
                        # This is sort of ugly. We special-case replacement by outputting
@@ -86,12 +93,43 @@ sub start_element {
                                $self->{'obj'} = XML::TemplateSAX::Buffer->new($match);
                                return;
                        }
+
+                       #
+                       # If someone tries to insert a full tree, do it, just like the character
+                       # replacement above.
+                       #
+                       if (ref($match) eq 'XML::TemplateSAX::Buffer') {
+                               $match->replay($self);
+                               $self->{'obj'} = undef;
+                       }
                        
                        $self->{'obj'} = $match;
                        return;
                }
        }
        
+       # 
+       # If we have multiple elements with the same name within each other,
+       # we need to keep track of how many there are, so check here and increment.
+       # end_element will decrement and optionally pop the stack.
+       #
+       my $stack = $self->{'stack'};
+       if (scalar @$stack > 0) {
+               my $top = $stack->[scalar @$stack - 1];
+
+               if ($data->{'Name'} eq $top->[0]) {
+                       ++$top->[1];
+               }
+       }
+
+       # within a replacement; just ignore everything  
+       return if (!defined($obj));
+
+       # within a cloning; slurp it up
+       if (ref($obj) eq 'XML::TemplateSAX::Buffer') {
+               $obj->start_element($data);
+               return;
+       }
 
        $self->SUPER::start_element($data);
 }
@@ -137,26 +175,30 @@ 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]) {
-                       my $obj = $self->{'obj'};
-
-                       # did we just finish a clone operation?
-                       if (ref($obj) eq 'XML::TemplateSAX::Buffer') {
-                               for my $instance (@{$obj->{'ptr'}}) {
-                                       $self->{'obj'} = $instance;
-                                       $obj->replay($self);
+                       if ($top->[1] == 0) {
+                               my $obj = $self->{'obj'};
+
+                               # did we just finish a clone operation?
+                               if (ref($obj) eq 'XML::TemplateSAX::Buffer') {
+                                       for my $instance (@{$obj->{'ptr'}}) {
+                                               $self->{'obj'} = $instance;
+                                               $obj->replay($self);
+                                       }
                                }
-                       }
 
-                       $self->SUPER::end_element($data);
-                       $self->{'obj'} = $top->[1];
-                       pop @$stack;
-                       return;
+                               $self->SUPER::end_element($data);
+                               $self->{'obj'} = $top->[2];
+                               pop @$stack;
+                               return;
+                       } else {
+                               --$top->[1];
+                       }
                }
        }