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=9141a51575c4154e831e7559884130378e556e1d;hb=cbae1049fb72c8be95c1d7dae26f83accb580a78;hpb=bdf3cf0e4ebca2f323ac5b709aced7de95286f21

diff --git a/lib/ZOOM/IRSpy/Record.pm b/lib/ZOOM/IRSpy/Record.pm
index 9141a51..a630356 100644
--- a/lib/ZOOM/IRSpy/Record.pm
+++ b/lib/ZOOM/IRSpy/Record.pm
@@ -1,6 +1,8 @@
-# $Id: Record.pm,v 1.20 2006-11-29 18:17:16 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;
@@ -32,6 +34,7 @@ sub new {
 	$zeerex = _empty_zeerex_record($target);
     }
 
+    ### Parser should be in the IRSpy object
     my $parser = new XML::LibXML();
     return bless {
 	irspy => $irspy,
@@ -98,7 +101,7 @@ 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 .= ">" . isodate(time()) . "</irspy:$type>\n";
@@ -158,21 +161,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;
-}
-
-
 =head1 SEE ALSO
 
 ZOOM::IRSpy