X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FNet%2FZ3950%2FPQF%2FNode.pm;h=c5d000494d1ea75fb4703fc09f6538f5783b9d6a;hb=f117766f6b68d479b8c96fd2e008d2cf805a57bb;hp=50e9ef5bb56056df49d4ebe544d1276f0e3275f3;hpb=fe37f9e6377eaa8977001ef017b339be7032760e;p=perl-pqf.git

diff --git a/lib/Net/Z3950/PQF/Node.pm b/lib/Net/Z3950/PQF/Node.pm
index 50e9ef5..c5d0004 100644
--- a/lib/Net/Z3950/PQF/Node.pm
+++ b/lib/Net/Z3950/PQF/Node.pm
@@ -1,4 +1,4 @@
-# $Id: Node.pm,v 1.1 2004-12-17 15:29:00 mike Exp $
+# $Id: Node.pm,v 1.4 2007-10-05 12:13:05 mike Exp $
 
 package Net::Z3950::PQF::Node;
 
@@ -12,7 +12,7 @@ Net::Z3950::PQF::Node - Abstract class for nodes in a PQF parse tree
 
 =head1 SYNOPSIS
 
- $node = new Net::Z3950::PQF::Term('unix');
+ $node = new Net::Z3950::PQF::TermNode('unix');
  $node->isa("Net::Z3950::PQF::Node") or die "oops";
 
 =head1 DESCRIPTION
@@ -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.
@@ -151,15 +157,35 @@ sub render {
 }
 
 
+=head2 toSimpleServer()
+
+ $node->toSimpleServer();
+
+Transforms the contents of the tree rooted at the specified node,
+returning a correpsonding tree of the Perl structures produced by the
+Net::Z3950::SimpleServer module and passed as the {RPN} argument to
+search handlers.  This emulation is useful for testing code that
+expects to receive queries in that format.
+
+=cut
+
+sub toSimpleServer {
+    my $class = shift();
+    die "can't translate an abstract $class into SimpleServer form";
+}
 
-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;
 }
@@ -169,7 +195,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";
@@ -178,10 +204,48 @@ sub render {
     return $text;
 }
 
+sub toSimpleServer {
+    my $this = shift();
+
+    my $attrs = bless [], "Net::Z3950::RPN::Attributes";
+    foreach my $attr (@{ $this->{attrs} }) {
+	my($set, $type, $val) = @$attr;
+	push @$attrs, bless {
+	    attributeSet => $set,
+	    attributeType => $type,
+	    attributeValue => $val, 
+	}, "Net::Z3950::RPN::Attribute";
+    }
+
+    return bless {
+	$this->_ssname() => $this->{value},
+	attributes => $attrs,
+    }, $this->_ssclass();
+}
+
+
+
+package Net::Z3950::PQF::TermNode;
+our @ISA = qw(Net::Z3950::PQF::LeafNode);
+
+sub _name { "term" }
+sub _ssname { "term" }
+sub _ssclass { "Net::Z3950::RPN::Term" }
+
+
+
+package Net::Z3950::PQF::RsetNode;
+our @ISA = qw(Net::Z3950::PQF::LeafNode);
+
+sub _name { "rset" }
+sub _ssname { "id" }
+sub _ssclass { "Net::Z3950::RPN::RSID" }
+
 
 
 # PRIVATE class, used as base by AndNode, OrNode and NotNode
 package Net::Z3950::PQF::BooleanNode;
+our @ISA = qw(Net::Z3950::PQF::Node);
 
 sub new {
     my $class = shift();
@@ -205,29 +269,40 @@ sub render {
     return $text;
 }
 
+sub toSimpleServer {
+    my $this = shift();
+
+    my $res;
+    foreach my $sub (@{ $this->{sub} }) {
+	push @$res, $sub->toSimpleServer();
+    }
+
+    return bless $res, $this->_ssclass();
+}
+
 
 
 package Net::Z3950::PQF::AndNode;
-use vars qw(@ISA);
-@ISA = qw(Net::Z3950::PQF::BooleanNode);
+our @ISA = qw(Net::Z3950::PQF::BooleanNode);
 
 sub _op { "and" }
+sub _ssclass { "Net::Z3950::RPN::And" }
 
 
 
 package Net::Z3950::PQF::OrNode;
-use vars qw(@ISA);
-@ISA = qw(Net::Z3950::PQF::BooleanNode);
+our @ISA = qw(Net::Z3950::PQF::BooleanNode);
 
 sub _op { "or" }
+sub _ssclass { "Net::Z3950::RPN::Or" }
 
 
 
 package Net::Z3950::PQF::NotNode;
-use vars qw(@ISA);
-@ISA = qw(Net::Z3950::PQF::BooleanNode);
+our @ISA = qw(Net::Z3950::PQF::BooleanNode);
 
 sub _op { "not" }
+sub _ssclass { "Net::Z3950::RPN::AndNote" }