X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FRecord.pm;h=38641ee7ceb1d58ea759fb569ae4887fa376ef35;hb=661bdf876acd181b2435f475a59524730eb2f2c3;hp=d782384f9c527cee51aba83c81736a250c432fd7;hpb=5a61be14a41e45b072d974f16df805c61f9eb7f3;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index d782384..38641ee 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.14 2006-10-12 16:54:13 mike Exp $
+# $Id: Record.pm,v 1.17 2006-10-23 12:22:52 sondberg Exp $
 
 package ZOOM::IRSpy::Record;
 
@@ -6,9 +6,6 @@ use 5.008;
 use strict;
 use warnings;
 
-use Exporter 'import';
-our @EXPORT_OK = qw(xml_encode);
-
 use XML::LibXML;
 use XML::LibXML::XPathContext;
 
@@ -51,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">
@@ -66,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) = @_;
@@ -90,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) {
@@ -112,6 +93,19 @@ sub append_entry {
     $this->_half_decent_appendWellBalancedChunk($nodes[0], $frag);
 }
 
+sub store_result {
+    my ($this, $type, %info) = @_;
+    my $xml = "<irspy:$type";
+
+    foreach my $key (keys %info) {
+        $xml .= " $key=\"" . $this->_string2cdata($info{$key}) . "\"";
+    }
+
+    $xml .= ">" . $this->_isodate(time()) . "</irspy:$type>\n";
+
+    $this->append_entry('irspy:status', $xml);
+}
+
 
 # *sigh*
 #
@@ -129,7 +123,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
@@ -143,7 +137,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;
     }
@@ -164,6 +158,27 @@ 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