-# $Id: Record.pm,v 1.7 2006-07-24 15:25:51 mike Exp $
+# $Id: Record.pm,v 1.13 2006-09-26 09:08:09 mike Exp $
package ZOOM::IRSpy::Record;
use strict;
use warnings;
+use Exporter 'import';
+our @EXPORT_OK = qw(xml_encode);
+
use XML::LibXML;
use XML::LibXML::XPathContext;
sub new {
my $class = shift();
- my($target, $zeerex) = @_;
+ my($irspy, $target, $zeerex) = @_;
if (!defined $zeerex) {
$zeerex = _empty_zeerex_record($target);
my $parser = new XML::LibXML();
return bless {
+ irspy => $irspy,
target => $target,
parser => $parser,
zeerex => $parser->parse_string($zeerex)->documentElement(),
### Doesn't recognise SRU/SRW URLs
my($host, $port, $db) = ZOOM::IRSpy::_parse_target_string($target);
+ my $xhost = xml_encode($host);
+ my $xport = xml_encode($port);
+ my $xdb = xml_encode($db);
return <<__EOT__;
<explain xmlns="http://explain.z3950.org/dtd/2.0/">
<serverInfo protocol="Z39.50" version="1995">
- <host>$host</host>
- <port>$port</port>
- <database>$db</database>
+ <host>$xhost</host>
+ <port>$xport</port>
+ <database>$xdb</database>
</serverInfo>
</explain>
__EOT__
}
+# I can't -- just can't, can't, can't -- believe that this function
+# isn't provided by one of the core XML modules. But the evidence all
+# says that it's not: among other things, XML::Generator and
+# Template::Plugin both roll their own. So I will do likewise. D'oh!
+#
+sub xml_encode {
+ my ($text) = @_;
+ $text =~ s/&/&/g;
+ $text =~ s/</</g;
+ $text =~ s/>/>/g;
+ $text =~ s/['']/'/g;
+ $text =~ s/[""]/"/g;
+ return $text;
+}
+
+
sub append_entry {
my $this = shift();
my($xpath, $frag) = @_;
- print STDERR "this=$this, xpath='$xpath', frag='$frag'\n";
+ #print STDERR "this=$this, xpath='$xpath', frag='$frag'\n";
my $root = $this->{zeerex}; # XML::LibXML::Element ISA XML::LibXML::Node
my $xc = XML::LibXML::XPathContext->new($root);
$xc->registerNs(zeerex => "http://explain.z3950.org/dtd/2.0/");
my @nodes = $xc->findnodes($xpath);
if (@nodes == 0) {
- ZOOM::Log::log("irspy", "no matches for '$xpath': can't append");
- return;
- } elsif (@nodes > 1) {
- ZOOM::Log::log("irspy", scalar(@nodes),
- " matches for '$xpath': using first");
+ # Make the node that we're inserting into, if possible. A
+ # fully general version would work its way through each
+ # component of the XPath, but for now we just treat it as a
+ # single chunk to go inside the top-level node.
+ $this->_half_decent_appendWellBalancedChunk($root,
+ "<$xpath></$xpath>");
+ @nodes = $xc->findnodes($xpath);
+ die("still no matches for '$xpath' after creating: can't append")
+ if @nodes == 0;
}
- my $node = $nodes[0];
- # $node ISA XML::LibXML::ElementXML::LibXML::Element
- $this->_half_decent_appendWellBalancedChunk($node, $frag);
- #print STDERR "POST: zeerex='$root' = \n", $root->toString(), "\n";
+ $this->{irspy}->log("irspy",
+ scalar(@nodes), " matches for '$xpath': using first")
+ if @nodes > 1;
+
+ $this->_half_decent_appendWellBalancedChunk($nodes[0], $frag);
}
die "mismatched XML start/end <$open>...<$close>"
if $close ne $tag;
print STDERR "tag='$tag', attrs=[$attrs], content='$content'\n";
- die "### no code yet to make DOM node";
+ die "## no code yet to make DOM node";
}