svn commit - mysqldoc@docsrva: r8051 - trunk/tools/MySQL/DynXML

[mcbrown]

Author: mcbrown
Date: 2007-10-11 14:29:15 +0200 (Thu, 11 Oct 2007)
New Revision: 8051

Log:
Putting the escaping into the right trigger function



Modified:
   trunk/tools/MySQL/DynXML/ChangelogParser.pm


Modified: trunk/tools/MySQL/DynXML/ChangelogParser.pm
===================================================================
--- trunk/tools/MySQL/DynXML/ChangelogParser.pm	2007-10-11 12:24:00 UTC (rev 8050)
+++ trunk/tools/MySQL/DynXML/ChangelogParser.pm	2007-10-11 12:29:15 UTC (rev 8051)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 5; 1190 bytes

@@ -138,10 +138,6 @@
     if ($element->{Name} eq 'message')
     {
         $self->{currententry}->{message} = join('',@{$self->{currenttext}});
-        $self->{currententry}->{message} =~ s/&/&/g;
-        $self->{currententry}->{message} =~ s/&([a-z_]);/&$1;/g;
-        $self->{currententry}->{message} =~ s/</&lt;/g;
-        $self->{currententry}->{message} =~ s/>/&gt;/g;
             
         $self->{savecdata} = 0;
         $self->{remapxmldata} = 0;

@@ -162,7 +158,17 @@
 sub characters
 {
     my ($self, $element) = @_;
-    push @{$self->{currenttext}},$element->{Data} if ($self->{savecdata});
+
+    if ($self->{savecdata})
+    {
+        my $rawtext = $element->{Data};
+        $rawtext =~ s/&/&amp;/g;
+        $rawtext =~ s/&amp;([a-z_]);/&$1;/g;
+        $rawtext =~ s/</&lt;/g;
+        $rawtext =~ s/>/&gt;/g;
+        
+        push @{$self->{currenttext}},$rawtext;
+    }
 }
 
 sub entity_reference