-# $Id: Record.pm,v 1.18 2006-10-30 16:13:49 mike Exp $
+# $Id: Record.pm,v 1.24 2007-04-27 14:04:40 mike Exp $
package ZOOM::IRSpy::Record;
+### I don't think there's any reason for this to be separate from
+# ZOOM::IRSpy::Connection, now that the correspondence is always 1:1
use 5.008;
use strict;
use XML::LibXML;
use XML::LibXML::XPathContext;
-use ZOOM::IRSpy::Utils qw(xml_encode);
+use ZOOM::IRSpy::Utils qw(xml_encode isodate);
=head1 NAME
$zeerex = _empty_zeerex_record($target);
}
+ ### Parser should be in the IRSpy object
my $parser = new XML::LibXML();
return bless {
irspy => $irspy,
sub _empty_zeerex_record {
my($target) = @_;
- ### Doesn't recognise SRU/SRW URLs
- my($host, $port, $db) = ZOOM::IRSpy::_parse_target_string($target);
+ my($protocol, $host, $port, $db) =
+ ZOOM::IRSpy::_parse_target_string($target);
+ my $xprotocol = xml_encode($protocol);
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">
+ <serverInfo protocol="$xprotocol">
<host>$xhost</host>
<port>$xport</port>
<database>$xdb</database>
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/");
- $xc->registerNs(irspy => $ZOOM::IRSpy::irspy_ns);
+ $xc->registerNs(irspy => $ZOOM::IRSpy::Utils::IRSPY_NS);
my @nodes = $xc->findnodes($xpath);
if (@nodes == 0) {
my $xml = "<irspy:$type";
foreach my $key (keys %info) {
- $xml .= " $key=\"" . $this->_string2cdata($info{$key}) . "\"";
+ $xml .= " $key=\"" . xml_encode($info{$key}) . "\"";
}
- $xml .= ">" . $this->_isodate(time()) . "</irspy:$type>\n";
+ $xml .= ">" . isodate(time()) . "</irspy:$type>\n";
$this->append_entry('irspy:status', $xml);
}
# namespace mapping for that node -- but that only affects pre-parsed
# trees, and is no use for parsing. Hence the following pair of lines
# DOES NOT WORK:
-# $node->setNamespace($ZOOM::IRSpy::irspy_ns, "irspy", 0);
+# $node->setNamespace($ZOOM::IRSpy::Utils::IRSPY_NS, "irspy", 0);
# $node->appendWellBalancedChunk($frag);
#
# Instead I have to go the long way round, hence this method. I have
my($node, $frag) = @_;
if (1) {
- $frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::irspy_ns">,;
+ $frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::Utils::IRSPY_NS">,;
$node->appendWellBalancedChunk($frag);
return;
}
}
-# Yes, I know that this is already implemented in IRSpy.pm. I suggest that we
-# introduce a toolkit package with such subroutines...
-#
-sub _string2cdata {
- my ($this, $buffer) = @_;
- $buffer =~ s/&/&/gs;
- $buffer =~ s/</</gs;
- $buffer =~ s/>/>/gs;
- $buffer =~ s/"/"/gs;
- $buffer =~ s/'/'/gs;
-
- return $buffer;
-}
-
-
-sub _isodate {
- my ($this, $time) = @_;
- return ZOOM::IRSpy::Test::isodate($time);
-}
-
-
=head1 SEE ALSO
ZOOM::IRSpy