implement rest of Name/Value unroll, fix Inform

[perl-cwmp.git] / lib / CWMP / Request.pm

diff --git a/lib/CWMP/Request.pm b/lib/CWMP/Request.pm
index d4817b0..0cea935 100644 (file)
--- a/lib/CWMP/Request.pm
+++ b/lib/CWMP/Request.pm
@@ -4,11 +4,12 @@ use warnings;
 use strict;
 
 use XML::Rules;
-use CWMP::Tree;
 use Data::Dump qw/dump/;
 use Carp qw/confess cluck/;
 use Class::Trigger;
 
+#use Devel::LeakTrace::Fast;
+
 =head1 NAME
 
 CWMP::Request - parse SOAP request metods
@@ -21,7 +22,7 @@ All methods described below call triggers with same name
 
 our $state;    # FIXME check this!
 
-my $rules =  [
+our $rules =  [
                #_default => 'content trim',
                x_default => sub {
                        my ($tag_name, $tag_hash, $context, $parent_data) = @_;
@@ -30,6 +31,7 @@ my $rules =  [
                'ID' => sub {
                        my ($tag_name, $tag_hash, $context, $parent_data) = @_;
                        $state->{ID} = $tag_hash->{_content};
+                       chomp( $state->{ID} );
                },
 
                'DeviceId' => sub {
@@ -102,6 +104,28 @@ push @$rules,
                        $state->{_trigger} = 'GetParameterNamesResponse';
                };
        
+=head2 GetParameterAttributesResponse
+
+=cut
+
+push @$rules,
+               'ParameterAttributeStruct' => sub {
+                       my ($tag_name, $tag_hash, $context, $parent_data) = @_;
+                       warn dump( $tag_name, $tag_hash, $context );
+       
+                       confess "need state" unless ( $state ); # don't remove!
+
+                       my $name = _tag($tag_hash, 'Name', '_content');
+
+
+                       $state->{ParameterAttribute}->{$name} = {
+                               Notification => _tag($tag_hash, 'Notification', '_content' ),
+                               AccessList => _tag($tag_hash, 'AccessList', 'string' ),
+                       };
+
+                       $state->{_trigger} = 'GetParameterAttributesResponse';
+               };
+
 =head2 Fault
 
 =cut
@@ -130,6 +154,8 @@ sub parse {
 
        my $xml = shift || confess "no xml?";
 
+       $state = {};
+
        my $parser = XML::Rules->new(
 #              start_rules => [
 #                      '^division_name,fax' => 'skip',
@@ -144,15 +170,18 @@ sub parse {
                rules => $rules,
        );
 
-       $state = {};
+#      warn "## created $parser\n";
 
        $parser->parsestring( $xml );
+
+       undef $parser;
+
        if ( my $trigger = $state->{_trigger} ) {
                warn "### call_trigger( $trigger )\n";
                $self->call_trigger( $trigger, $state );
        }
-       # XXX don't propagate _trigger (useful?)
-       delete( $state->{_trigger} );
+       # XXX propagate _trigger (useful for symlinks)
+
        return $state;
 }