Remove redundant _string2cdata() method, use xml_encode() instead.

[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 52e2b41..a0738c8 100644 (file)
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,4 +1,4 @@
-# $Id: Record.pm,v 1.19 2006-11-01 10:14:56 mike Exp $
+# $Id: Record.pm,v 1.21 2006-11-30 12:01:23 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
 
@@ -98,10 +98,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);
 }
@@ -158,27 +158,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