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

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 7b4125a..a630356 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,17 +1,16 @@
-# $Id: Record.pm,v 1.12 2006-09-25 14:21:07 mike Exp $
+# $Id: Record.pm,v 1.23 2007-03-05 19:42:13 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 warnings;
 
-use Exporter 'import';
-our @EXPORT_OK = qw(xml_encode);
-
 use XML::LibXML;
 use XML::LibXML::XPathContext;
-
+use ZOOM::IRSpy::Utils qw(xml_encode isodate);
 
 =head1 NAME
 
@@ -29,14 +28,16 @@ I<## To follow>
 
 sub new {
     my $class = shift();
-    my($target, $zeerex) = @_;
+    my($irspy, $target, $zeerex) = @_;
 
     if (!defined $zeerex) {
 	$zeerex = _empty_zeerex_record($target);
     }
 
+    ### Parser should be in the IRSpy object
     my $parser = new XML::LibXML();
     return bless {
+	irspy => $irspy,
 	target => $target,
 	parser => $parser,
 	zeerex => $parser->parse_string($zeerex)->documentElement(),
@@ -65,22 +66,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) = @_;
@@ -89,7 +74,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::Utils::IRSPY_NS);
 
     my @nodes = $xc->findnodes($xpath);
     if (@nodes == 0) {
@@ -104,13 +89,26 @@ 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);
 }
 
+sub store_result {
+    my ($this, $type, %info) = @_;
+    my $xml = "<irspy:$type";
+
+    foreach my $key (keys %info) {
+        $xml .= " $key=\"" . xml_encode($info{$key}) . "\"";
+    }
+
+    $xml .= ">" . isodate(time()) . "</irspy:$type>\n";
+
+    $this->append_entry('irspy:status', $xml);
+}
+
 
 # *sigh*
 #
@@ -128,7 +126,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::Utils::IRSPY_NS, "irspy", 0);
 #	$node->appendWellBalancedChunk($frag);
 #
 # Instead I have to go the long way round, hence this method.  I have
@@ -142,7 +140,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::Utils::IRSPY_NS">,;
 	$node->appendWellBalancedChunk($frag);
 	return;
     }