Move xml_encode() from IRSpy to Utils

[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 c213f54..a7c8bc6 100644 (file)
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.15 2006-10-13 13:41:57 sondberg Exp $
+# $Id: Record.pm,v 1.18 2006-10-30 16:13:49 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);
 
 =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) = @_;
@@ -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*
 #
@@ -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