X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=8c9282637a4051d8c91320a4dddddc72d66398d1;hp=a7c8bc63fa8573b92052ccf5788f24249903a116;hb=344f9c77faf271fabec750cb05f0d7411083c32e;hpb=01db8593a91d42a9dc554edc17d0c2c1b3858ef5

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index a7c8bc6..8c92826 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.18 2006-10-30 16:13:49 mike Exp $
+# $Id: Record.pm,v 1.22 2007-03-01 13:21:05 mike Exp $
 
 package ZOOM::IRSpy::Record;
 
@@ -8,7 +8,7 @@ use warnings;
 
 use XML::LibXML;
 use XML::LibXML::XPathContext;
-use ZOOM::IRSpy::Utils qw(xml_encode);
+use ZOOM::IRSpy::Utils qw(xml_encode isodate);
 
 =head1 NAME
 
@@ -32,6 +32,7 @@ sub new {
 	$zeerex = _empty_zeerex_record($target);
     }
 
+    ### Parser should be in the IRSpy object
     my $parser = new XML::LibXML();
     return bless {
 	irspy => $irspy,
@@ -71,7 +72,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 => $ZOOM::IRSpy::irspy_ns);
+    $xc->registerNs(irspy => $ZOOM::IRSpy::Utils::IRSPY_NS);
 
     my @nodes = $xc->findnodes($xpath);
     if (@nodes == 0) {
@@ -98,10 +99,10 @@ sub store_result {
     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);
 }
@@ -123,7 +124,7 @@ sub store_result {
 # 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
@@ -137,7 +138,7 @@ sub _half_decent_appendWellBalancedChunk {
     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;
     }
@@ -158,27 +159,6 @@ sub _half_decent_appendWellBalancedChunk {
 }
 
 
-# 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/&/&amp;/gs;
-    $buffer =~ s/</&lt;/gs;
-    $buffer =~ s/>/&gt;/gs;
-    $buffer =~ s/"/&quot;/gs;
-    $buffer =~ s/'/&apos;/gs;
-
-    return $buffer;
-}
-
-
-sub _isodate {
-    my ($this, $time) = @_;
-    return ZOOM::IRSpy::Test::isodate($time);
-}
-
-
 =head1 SEE ALSO
 
 ZOOM::IRSpy