our @ISA = qw(Net::Z3950::RPN::Node);
package Net::Z3950::RPN::AndNot;
our @ISA = qw(Net::Z3950::RPN::Node);
+package Net::Z3950::RPN::Prox;
+our @ISA = qw(Net::Z3950::RPN::Node);
package Net::Z3950::RPN::Term;
our @ISA = qw(Net::Z3950::RPN::Node);
package Net::Z3950::RPN::RSID;
our @ISA = qw(Net::Z3950::RPN::Node);
package Net::Z3950::RPN::Attributes;
package Net::Z3950::RPN::Attribute;
+package Net::Z3950::RPN::Prox::Attributes;
package Net::Z3950::FacetList;
package Net::Z3950::FacetField;
package Net::Z3950::FacetTerms;
return '@and ' . $this->[0]->toPQF() . ' ' . $this->[1]->toPQF();
} elsif ($class eq "Net::Z3950::RPN::AndNot") {
return '@not ' . $this->[0]->toPQF() . ' ' . $this->[1]->toPQF();
+ } elsif ($class eq "Net::Z3950::RPN::Prox") {
+ my $pattrs = $this->[3];
+ return '@prox ' . $pattrs->{exclusion} . ' ' . $pattrs->{distance} . ' ' . $pattrs->{ordered} . ' ' . $pattrs->{relationType} . (defined $pattrs->{known} ? ' k ' . $pattrs->{known} : ' p ' . $pattrs->{zprivate}) . ' ' . $this->[0]->toPQF() . ' ' . $this->[1]->toPQF();
} elsif ($class eq "Net::Z3950::RPN::RSID") {
return '@set ' . $this->{id};
} elsif ($class ne "Net::Z3950::RPN::Term") {
=head1 AUTHORS
-Anders Sønderberg (sondberg@indexdata.dk),
+Anders Sønderberg (sondberg@indexdata.dk),
Sebastian Hammer (quinn@indexdata.dk),
Mike Taylor (indexdata.com).
case Z_Operator_and: type = "Net::Z3950::RPN::And"; break;
case Z_Operator_or: type = "Net::Z3950::RPN::Or"; break;
case Z_Operator_and_not: type = "Net::Z3950::RPN::AndNot"; break;
- case Z_Operator_prox: fatal("proximity not yet supported");
+ case Z_Operator_prox: type = "Net::Z3950::RPN::Prox"; break;
default: fatal("unknown RPN operator %d", (int) c->roperator->which);
}
sv = newObject(type, (SV*) (av = newAV()));
if ((tmp = rpn2perl(c->s2)) == 0)
return 0;
av_push(av, tmp);
+ if (c->roperator->which == Z_Operator_prox) {
+ Z_ProximityOperator prox = *c->roperator->u.prox;
+ HV *hv;
+ tmp = newObject("Net::Z3950::RPN::Prox::Attributes", (SV*) (hv = newHV()));
+ setMember(hv, "exclusion", newSViv(*prox.exclusion));
+ setMember(hv, "distance", newSViv(*prox.distance));
+ setMember(hv, "ordered", newSViv(*prox.ordered));
+ setMember(hv, "relationType", newSViv(*prox.relationType));
+ if (prox.which == Z_ProximityOperator_known) {
+ setMember(hv, "known", newSViv(*prox.u.known));
+ } else {
+ setMember(hv, "zprivate", newSViv(*prox.u.zprivate));
+ }
+ av_push(av, tmp);
+ }
return sv;
}