svn commit - mysqldoc@docsrva: r8527 - in trunk: . tools

[paul]

Author: paul
Date: 2007-11-04 21:31:32 +0100 (Sun, 04 Nov 2007)
New Revision: 8527

Log:
 r32252@arctic:  paul | 2007-11-04 14:16:19 -0600
 Encode entity characters


Modified:
   trunk/tools/make-errmsgs-client.pl
   trunk/tools/make-errmsgs-server.pl
   trunk/tools/update-reserved-words.pl

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32228
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26546
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32252
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26546
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581


Modified: trunk/tools/make-errmsgs-client.pl
===================================================================
--- trunk/tools/make-errmsgs-client.pl	2007-11-04 09:24:06 UTC (rev 8526)
+++ trunk/tools/make-errmsgs-client.pl	2007-11-04 20:31:32 UTC (rev 8527)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 724 bytes

@@ -27,6 +27,7 @@
 
 use strict;
 
+use HTML::Entities;
 use Getopt::Long;
 $Getopt::Long::ignorecase = 0; # options are case sensitive
 $Getopt::Long::bundling = 1;   # allow short options to be bundled

@@ -215,6 +216,7 @@
 		print "<listitem><para>\n";
 		print "$term_error: <literal>$err_num</literal>\n";
 		print "(<literal>$err_sym</literal>)\n</para>\n";
+		$msg = encode_entities ($msg, "<>&");
 		print "\n<para>$term_message: $msg\n";
 		print "</para></listitem>\n";
 	}


Modified: trunk/tools/make-errmsgs-server.pl
===================================================================
--- trunk/tools/make-errmsgs-server.pl	2007-11-04 09:24:06 UTC (rev 8526)
+++ trunk/tools/make-errmsgs-server.pl	2007-11-04 20:31:32 UTC (rev 8527)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 748 bytes

@@ -50,6 +50,7 @@
 use strict;
 
 use Encode;   # for charset conversion
+use HTML::Entities;
 
 use Getopt::Long;
 $Getopt::Long::ignorecase = 0; # options are case sensitive

@@ -213,6 +214,7 @@
     print "<listitem><para>\n";
     print "$term_error: <literal>$err_num</literal> SQLSTATE:
<literal>$sqlstate</literal>\n";
     print "(<literal>$err_sym</literal>)\n</para>\n";
+    $msg = encode_entities ($msg, "<>&");
     print "\n<para>$term_message: $msg\n";
     print "</para></listitem>\n";
   }


Modified: trunk/tools/update-reserved-words.pl
===================================================================
--- trunk/tools/update-reserved-words.pl	2007-11-04 09:24:06 UTC (rev 8526)
+++ trunk/tools/update-reserved-words.pl	2007-11-04 20:31:32 UTC (rev 8527)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 547 bytes

@@ -233,7 +233,7 @@
   # Fill last row to full # of columns.
   for( ; $i%3; $i++) {
     $list .= "  <row>\n" if $i%3 == 0;
-    $list .= "    <entry></entry>\n";
+    $list .= "    <entry/>\n";
     $list .= "  </row>\n" if $i%3 == 2;
   }
   $list .= "</tbody></tgroup></informaltable>\n";