X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=6f80ac35abd9253fbd4dd8a61ea583b893983bda;hp=a630356a6296bd4cf4ae80a680d00a90cd8cdb0c;hb=e3aba5d3bacf45188bcb5d2b65da66bb8cfe14dd;hpb=cbae1049fb72c8be95c1d7dae26f83accb580a78

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index a630356..6f80ac3 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.23 2007-03-05 19:42:13 mike Exp $
+# $Id: Record.pm,v 1.26 2007-08-02 11:27:32 mike Exp $
 
 package ZOOM::IRSpy::Record;
 ### I don't think there's any reason for this to be separate from
@@ -10,7 +10,7 @@ use warnings;
 
 use XML::LibXML;
 use XML::LibXML::XPathContext;
-use ZOOM::IRSpy::Utils qw(xml_encode isodate);
+use ZOOM::IRSpy::Utils qw(xml_encode isodate irspy_xpath_context);
 
 =head1 NAME
 
@@ -48,15 +48,16 @@ sub new {
 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>
@@ -71,8 +72,7 @@ sub append_entry {
     my($xpath, $frag) = @_;
 
     #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);
+    my $xc = $this->xpath_context();
     $xc->registerNs(zeerex => "http://explain.z3950.org/dtd/2.0/");
     $xc->registerNs(irspy => $ZOOM::IRSpy::Utils::IRSPY_NS);
 
@@ -82,7 +82,7 @@ sub append_entry {
 	# 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,
+	$this->_half_decent_appendWellBalancedChunk($xc->getContextNode(),
 						    "<$xpath></$xpath>");
 	@nodes = $xc->findnodes($xpath);
 	die("still no matches for '$xpath' after creating: can't append")
@@ -96,6 +96,12 @@ sub append_entry {
     $this->_half_decent_appendWellBalancedChunk($nodes[0], $frag);
 }
 
+sub xpath_context {
+    my $this = shift();
+
+    return irspy_xpath_context($this->{zeerex});
+}
+
 sub store_result {
     my ($this, $type, %info) = @_;
     my $xml = "<irspy:$type";
@@ -141,6 +147,7 @@ sub _half_decent_appendWellBalancedChunk {
 
     if (1) {
 	$frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::Utils::IRSPY_NS">,;
+	warn "calling appendWellBalancedChunk($node)";
 	$node->appendWellBalancedChunk($frag);
 	return;
     }