Remove _isodate() method, used only within the class.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy / Record.pm

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 1ab5033..9141a51 100644 (file)
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.13 2006-09-26 09:08:09 mike Exp $
+# $Id: Record.pm,v 1.20 2006-11-29 18:17:16 mike Exp $
 
 package ZOOM::IRSpy::Record;
 
@@ -6,12 +6,9 @@ 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
 
@@ -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/&/&/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::Utils::IRSPY_NS);
 
     my @nodes = $xc->findnodes($xpath);
     if (@nodes == 0) {
@@ -105,13 +86,26 @@ sub append_entry {
            if @nodes == 0;
     }
 
-    $this->{irspy}->log("irspy",
+    $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=\"" . $this->_string2cdata($info{$key}) . "\"";
+    }
+
+    $xml .= ">" . 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::Utils::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::Utils::IRSPY_NS">,;
        $node->appendWellBalancedChunk($frag);
        return;
     }
@@ -164,6 +158,21 @@ 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;
+}
+
+
 =head1 SEE ALSO
 
 ZOOM::IRSpy