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

[mcbrown]

Author: mcbrown
Date: 2007-04-14 07:55:49 +0200 (Sat, 14 Apr 2007)
New Revision: 5900

Log:
Changing the parsing and display of version information so that it is now tagged against the base series number, and displayed accordingly. In the item summary only the version number for the current display manual is used, for a full version summary, we display all numbers.



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


Modified: trunk/tools/dyndocs-optvars-generate.pl
===================================================================
--- trunk/tools/dyndocs-optvars-generate.pl	2007-04-14 05:50:27 UTC (rev 5899)
+++ trunk/tools/dyndocs-optvars-generate.pl	2007-04-14 05:55:49 UTC (rev 5900)
Changed blocks: 7, Lines Added: 13, Lines Deleted: 29; 4078 bytes

@@ -277,7 +277,7 @@
 
 sub compound_optype
 {
-    my ($item,$type,$fieldtitle,$iodest) = @_;
+    my ($item,$type,$fieldtitle,$iodest,$options) = @_;
 
     if (exists($item->{type}->{$type}))
     {

@@ -299,8 +299,8 @@
         }
         elsif (exists($item->{type}->{$type}->{inversion}))
         {
-            if (defined($item->{introduced}->{real}) && 
-                ($item->{type}->{$type}->{inversion} ne $item->{introduced}->{real}))
+            if (defined($item->{introduced}->{$options->{version}}->{real}) && 
+                ($item->{type}->{$type}->{inversion} ne $item->{introduced}->{$options->{version}}->{real}))
             {
                 printf $iodest (xml_row(xml_entry(xml_bold($fieldtitle)),
                                           xml_entrytbl(xml_row(xml_entry(xml_literal($item->{type}->{$type}->{format} || 

@@ -388,11 +388,11 @@
     print $iodest (xml_row(xml_entry(xml_bold('Description')),
                              xml_entry($item->{shortdescription})));
     print $iodest (xml_row(xml_entry(xml_bold('Version Introduced')),
-                             xml_entry($item->{introduced}->{real})))
-        if (exists($item->{introduced}->{real}));
+                             xml_entry($item->{introduced}->{$options->{version}}->{real})))
+        if (exists($item->{introduced}->{$options->{version}}->{real}));
     
-    compound_optype($item,'cmdline','Command Line Format',$iodest);
-    compound_optype($item,'mycnf','Config File Format',$iodest);
+    compound_optype($item,'cmdline','Command Line Format',$iodest,$options);
+    compound_optype($item,'mycnf','Config File Format',$iodest,$options);
     
     print $iodest (xml_row(xml_entry(xml_bold('Option Sets Variable')),
                              xml_entry('Yes, ',xml_literal($item->{type}->{cmdline}->{setvar} ||

@@ -672,23 +672,6 @@
             push @{$row},'';
         }
         
-#    if (exists($td->{$id}->{introduced}))
-#    {
-#        if ($td->{$id}->{introduced}->{check} >= $checkversion)
-#        {
-#            push @{$row},$td->{$id}->{introduced}->{real};
-#        }
-#        else
-#        {
-#            push @{$row},undef;
-#        }
-#    }
-#    else
-#    {
-#        push @{$row},undef;
-#    }
-
-
         if (exists($td->{$id}->{type}->{cmdline}->{setvar}) && 
             $td->{$id}->{type}->{cmdline}->{setvar} ne $id)
         {

@@ -807,7 +790,7 @@
 <entry><emphasis role="bold">File</emphasis></entry>
 <entry><emphasis role="bold">Srvr</emphasis></entry>
 <entry><emphasis role="bold">Stat.</emphasis></entry>
-<entry><emphasis role="bold">Scope</emphasis></entry>
+<entry><emphasis role="bold">Scp.</emphasis></entry>
 <entry><emphasis role="bold">Dyn.</emphasis></entry>
 <entry><emphasis role="bold">4.1</emphasis></entry>
 <entry><emphasis role="bold">5.0</emphasis></entry>

@@ -828,7 +811,7 @@
 
         if (exists($td->{$id}->{introduced}))
         {
-            push @{$row},xml_entry($td->{$id}->{introduced}->{real});
+            push @{$row},xml_entry(join(', ',map { $_ = $td->{$id}->{introduced}->{$_}->{real} } sort keys %{$td->{$id}->{introduced}}));
         }
         else
         {

@@ -1185,9 +1168,10 @@
     }
     if ($element->{Name} eq 'introduced')
     {
-        $self->{tabledata}->{$self->{currentid}}->{introduced} = {real => $element->{Attributes}->{version},
-                                                                  check => main::vertodec($element->{Attributes}->{version}),
-                                                              };
+        my ($basever) = ($element->{Attributes}->{version} =~ m/^([0-9]+\.[0-9]+)/);
+        $self->{tabledata}->{$self->{currentid}}->{introduced}->{$basever} = 
+        {real => $element->{Attributes}->{version},
+         check => main::vertodec($element->{Attributes}->{version}),}
     }
     if ($element->{Name} eq 'manual')
     {