Support for Rset nodes and forparsing @set, test scripts

[perl-pqf.git] / lib / Net / Z3950 / PQF / Node.pm

diff --git a/lib/Net/Z3950/PQF/Node.pm b/lib/Net/Z3950/PQF/Node.pm
index 41ede95..adaa46c 100644 (file)
--- a/lib/Net/Z3950/PQF/Node.pm
+++ b/lib/Net/Z3950/PQF/Node.pm
@@ -1,4 +1,4 @@
-# $Id: Node.pm,v 1.2 2004-12-20 09:23:11 mike Exp $
+# $Id: Node.pm,v 1.3 2004-12-20 09:46:58 mike Exp $
 
 package Net::Z3950::PQF::Node;
 
@@ -48,6 +48,12 @@ and a
 I<value>
 which may be either an integer or a string.
 
+=item C<RsetNode>
+
+Represents a result-set node, a reference to the name of a prior
+result set.  The result-set name is accompanied by zero or more
+attributes as above.
+
 =item C<AndNode>
 
 Represents an AND node with two sub-nodes.
@@ -152,15 +158,16 @@ sub render {
 
 
 
-package Net::Z3950::PQF::TermNode;
+# PRIVATE base class, used as base by TermNode and RsetNode
+package Net::Z3950::PQF::LeafNode;
 our @ISA = qw(Net::Z3950::PQF::Node);
 
 sub new {
     my $class = shift();
-    my($term, @attrs) = @_;
+    my($value, @attrs) = @_;
 
     return bless {
-       term => $term,
+       value => $value,
        attrs => [ @attrs ],
     }, $class;
 }
@@ -170,7 +177,7 @@ sub render {
     my($level) = @_;
 
     die "render() called with no level" if !defined $level;
-    my $text = ("\t" x $level) . "term: " . $this->{term} . "\n";
+    my $text = ("\t" x $level) . $this->_name() . ": " . $this->{value} . "\n";
     foreach my $attr (@{ $this->{attrs} }) {
        my($set, $type, $val) = @$attr;
        $text .= ("\t" x ($level+1)) . "attr: $set $type=$val\n";
@@ -181,6 +188,20 @@ sub render {
 
 
 
+package Net::Z3950::PQF::TermNode;
+our @ISA = qw(Net::Z3950::PQF::LeafNode);
+
+sub _name { "term" }
+
+
+
+package Net::Z3950::PQF::RsetNode;
+our @ISA = qw(Net::Z3950::PQF::LeafNode);
+
+sub _name { "rset" }
+
+
+
 # PRIVATE class, used as base by AndNode, OrNode and NotNode
 package Net::Z3950::PQF::BooleanNode;
 our @ISA = qw(Net::Z3950::PQF::Node);