svn commit - mysqldoc@docsrva: r10598 - in trunk/tools: . MySQL MySQL/DynXML

[mcbrown]

Author: mcbrown
Date: 2008-04-27 15:17:03 +0200 (Sun, 27 Apr 2008)
New Revision: 10598

Log:
Adding support for translations on DynXML during validation/deep-check



Modified:
   trunk/tools/MySQL/DynXML.pm
   trunk/tools/MySQL/DynXML/Optvar.pm
   trunk/tools/idmap.pl


Modified: trunk/tools/MySQL/DynXML/Optvar.pm
===================================================================
--- trunk/tools/MySQL/DynXML/Optvar.pm	2008-04-27 11:34:42 UTC (rev 10597)
+++ trunk/tools/MySQL/DynXML/Optvar.pm	2008-04-27 13:17:03 UTC (rev 10598)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 452 bytes

@@ -107,7 +107,7 @@
 {
     my ($self,$options) = @_;
 
-    $self->load_command_xml($options->{command});
+    $self->load_command_xml($options->{command},$options->{lang});
 }
 
 sub dump_translation


Modified: trunk/tools/MySQL/DynXML.pm
===================================================================
--- trunk/tools/MySQL/DynXML.pm	2008-04-27 11:34:42 UTC (rev 10597)
+++ trunk/tools/MySQL/DynXML.pm	2008-04-27 13:17:03 UTC (rev 10598)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 847 bytes

@@ -195,11 +195,12 @@
 
     foreach my $loadlang (('en',$lang))
     {
-        next unless (defined($loadlang));
+        next unless (defined($loadlang) && ($loadlang =~ m/^[a-zA-Z]{2}$/));
         if (!exists($self->{langtitlecache}->{$loadlang}))
         {
             my $filename = sprintf('%s/metadata-titles.%s.xml',
-                                   $self->{options}->{srclangdir},
+                                   $self->{options}->{srclangdir} ||
+                                   $self->{options}->{srcdir},
                                    $loadlang);
             
             if (-f $filename)


Modified: trunk/tools/idmap.pl
===================================================================
--- trunk/tools/idmap.pl	2008-04-27 11:34:42 UTC (rev 10597)
+++ trunk/tools/idmap.pl	2008-04-27 13:17:03 UTC (rev 10598)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 2; 1298 bytes

@@ -39,14 +39,20 @@
 my $opt_debug = 0;
 my $opt_extendinfo = 0;
 my $opt_srcdir = '';
+my $opt_srclangdir = '';
+my $opt_lang = undef;
 
 GetOptions(
     "reconcile" => \$opt_reconcile,
     "extendinfo" => \$opt_extendinfo,
     "debug" => \$opt_debug,
     "srcdir=s" => \$opt_srcdir,
+    "srclangdir=s" => \$opt_srclangdir,
+    "lang=s" => \$opt_lang,
     );
 
+$opt_lang = 'en' unless defined($opt_lang);
+
 # Get the document base URL stub
 
 my $urlbase = shift;

@@ -280,9 +286,13 @@
 
 # Dynamic Docs stubs
 
-        my $options = {srcdir => $opt_srcdir};
+        my $options = {srcdir => $opt_srcdir,
+                       srclangdir => $opt_srclangdir || $opt_srcdir,
+                       lang => $opt_lang,
+                       dictlang => $opt_lang,
+                   };
         
-        my $dynxml = MySQL::DynXML->new();
+        my $dynxml = MySQL::DynXML->new($options);
         my $OptVars = new MySQL::DynXML::Optvar($dynxml,$options);
         my $OpFuncs = new MySQL::DynXML::Opfuncs($dynxml,$options);
         my $ResWords = new MySQL::DynXML::ReservedWords($dynxml,$options);