X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=532603a218d6008594bb5592149b5100662d7b82;hb=0638e67b3dc9ba77cc1f9c759526c3e3e4a26c0d;hp=081e19d064f4db4971263ad3817806109be76101;hpb=69dac006c8683ba1b15afd8208004f439af5a1a1;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 081e19d..532603a 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.11 2006-09-25 12:39:34 mike Exp $
+# $Id: Record.pm,v 1.16 2006-10-20 14:51:01 mike Exp $
 
 package ZOOM::IRSpy::Record;
 
@@ -26,7 +26,7 @@ I<## To follow>
 
 sub new {
     my $class = shift();
-    my($target, $zeerex) = @_;
+    my($irspy, $target, $zeerex) = @_;
 
     if (!defined $zeerex) {
 	$zeerex = _empty_zeerex_record($target);
@@ -34,6 +34,7 @@ sub new {
 
     my $parser = new XML::LibXML();
     return bless {
+	irspy => $irspy,
 	target => $target,
 	parser => $parser,
 	zeerex => $parser->parse_string($zeerex)->documentElement(),
@@ -47,9 +48,9 @@ sub _empty_zeerex_record {
     ### 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);
+    my $xhost = ZOOM::IRSpy::xml_encode($host);
+    my $xport = ZOOM::IRSpy::xml_encode($port);
+    my $xdb = ZOOM::IRSpy::xml_encode($db);
     return <<__EOT__;
 <explain xmlns="http://explain.z3950.org/dtd/2.0/">
  <serverInfo protocol="Z39.50" version="1995">
@@ -62,22 +63,6 @@ __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/&/&amp;/g;
-    $text =~ s/</&lt;/g;
-    $text =~ s/>/&gt;/g;
-    $text =~ s/['']/&apos;/g;
-    $text =~ s/[""]/&quot;/g;
-    return $text;
-}
-
-
 sub append_entry {
     my $this = shift();
     my($xpath, $frag) = @_;
@@ -86,7 +71,7 @@ sub append_entry {
     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 => "http://indexdata.com/irspy/1.0");
+    $xc->registerNs(irspy => $ZOOM::IRSpy::irspy_ns);
 
     my @nodes = $xc->findnodes($xpath);
     if (@nodes == 0) {
@@ -101,8 +86,8 @@ sub append_entry {
 	    if @nodes == 0;
     }
 
-    ZOOM::Log::log("irspy",
-		   scalar(@nodes), " matches for '$xpath': using first")
+    $this->{irspy}->log("warn",
+			scalar(@nodes), " matches for '$xpath': using first")
 	if @nodes > 1;
 
     $this->_half_decent_appendWellBalancedChunk($nodes[0], $frag);
@@ -125,7 +110,7 @@ sub append_entry {
 # 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("http://indexdata.com/irspy/1.0", "irspy", 0);
+#	$node->setNamespace($ZOOM::IRSpy::irspy_ns, "irspy", 0);
 #	$node->appendWellBalancedChunk($frag);
 #
 # Instead I have to go the long way round, hence this method.  I have
@@ -139,7 +124,7 @@ sub _half_decent_appendWellBalancedChunk {
     my($node, $frag) = @_;
 
     if (1) {
-	$frag =~ s,>, xmlns:irspy="http://indexdata.com/irspy/1.0">,;
+	$frag =~ s,>, xmlns:irspy="$ZOOM::IRSpy::irspy_ns">,;
 	$node->appendWellBalancedChunk($frag);
 	return;
     }