Changeset 22828

Timestamp:

09/09/10 10:43:33 (17 months ago)

Author:

alex

Message:

Made node handling cleaner with attribute methods, and added check for confused xml formats (new constraint style under old-style nodes)

File:

• branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/Query/Handler.pm (modified) (4 diffs)

branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/Query/Handler.pm

@@ -34 +34 @@
     is => 'rw',
     isa => HashRef,
+);
+
+has current_node => (
+    is      => 'ro',
+    writer  => 'set_current_node',
+    clearer => 'clear_current_node',
+    isa     => Str,
 );
 
@@ -101 +108 @@
     elsif ($args->{Name} eq 'node') {
     my $path = $args->{Attributes}{path};
-    $self->{current_node} = $path;
+    $self->set_current_node($path);
     $query->add_constraint(
                    path => $path,
@@ -146 +153 @@
     $self->query->add_constraint(%args);
     }
+    elsif ($name eq 'node') {
+    $self->clear_current_node;
+    }
     $self->pop_element;
 }
@@ -152 +162 @@
     my $self = shift;
     my $attr = $self->current_constraint_attr;
-    my %args = (path => ($attr->{path} || $self->{current_node}) );
+    confess "Constraint element cannot have a path attribute inside a node"
+    if ($attr->{path} and $self->current_node);
+    my %args = (path => ($attr->{path} || $self->current_node) );
     $args{code}        = $attr->{code} if $attr->{code};
     $args{op}          = $attr->{op}   if $attr->{op};