svn commit - mysqldoc@docsrva: r6606 - trunk/tools

[mcbrown]

Author: mcbrown
Date: 2007-05-30 17:19:01 +0200 (Wed, 30 May 2007)
New Revision: 6606

Log:
Updating error message warning in dyndocs
Supporting comments in imported arbitrary elements



Modified:
   trunk/tools/dyndocs-optvars-generate.pl
   trunk/tools/genarbelements.pl


Modified: trunk/tools/dyndocs-optvars-generate.pl
===================================================================
--- trunk/tools/dyndocs-optvars-generate.pl	2007-05-29 14:25:51 UTC (rev 6605)
+++ trunk/tools/dyndocs-optvars-generate.pl	2007-05-30 15:19:01 UTC (rev 6606)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 1; 917 bytes

@@ -607,6 +607,7 @@
         {
             $tdcache->{$command} = $commandxml;
         }
+        $options->{command} = $command;
 
         next unless (exists($tdcache->{$command}) && defined($tdcache->{$command}));
 

@@ -891,7 +892,8 @@
             }
             else
             {
-                print STDERR "WARNING: xrefto $td->{$id}->{xrefto} points to an ID not in the ID map\n";
+                printf STDERR ("WARNING: xrefto |%s| in $options->{command} points to an ID not in the ID map\n",
+                               $td->{$id}->{xrefto} || '');
             }
                 
             print $iodest summaryrow($row,$opts,$idmap);


Modified: trunk/tools/genarbelements.pl
===================================================================
--- trunk/tools/genarbelements.pl	2007-05-29 14:25:51 UTC (rev 6605)
+++ trunk/tools/genarbelements.pl	2007-05-30 15:19:01 UTC (rev 6606)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 0; 767 bytes

@@ -28,6 +28,7 @@
     workbench 
     falcon 
     ndbapi
+    merlin
     /;
 
 my @srcpaths = (); 

@@ -473,6 +474,7 @@
     my $seenfragment = 0;
     my $fragmentlevel = 0;
     my $inbody = 0;
+    my $incomment = 0;
 
     if ($spec->{type} eq 'fragment')
     {

@@ -491,6 +493,9 @@
 
     foreach (split(/[\r\n]+/,$filetxt))
     {
+        $incomment = 1 if ($_ =~ m/<!--/);
+        $incomment = 0 if ($incomment && ($_ =~ /-->/));
+        next if ($incomment);
         if ($_ =~ m{SYSTEM\s*?"(.*?)"})
         {
             my $loc = $1;