svn commit - mysqldoc@docsrva: r7281 - in trunk: dynamic-docs/command-optvars tools

[mcbrown]

Author: mcbrown
Date: 2007-07-31 11:58:38 +0200 (Tue, 31 Jul 2007)
New Revision: 7281

Log:
Changing server var to system var



Modified:
   trunk/dynamic-docs/command-optvars/options.dtd
   trunk/tools/dyndocs-optvars-generate.pl


Modified: trunk/dynamic-docs/command-optvars/options.dtd
===================================================================
--- trunk/dynamic-docs/command-optvars/options.dtd	2007-07-31 09:34:15 UTC (rev 7280)
+++ trunk/dynamic-docs/command-optvars/options.dtd	2007-07-31 09:58:38 UTC (rev 7281)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 779 bytes

@@ -20,8 +20,8 @@
 <!ATTLIST vartype inversion CDATA #IMPLIED>
 <!ATTLIST vartype outversion CDATA #IMPLIED>
 <!ATTLIST vartype format CDATA #IMPLIED>
-<!ATTLIST vartype scope (global|session|both) #IMPLIED>
-<!ATTLIST vartype class (status | server|both) #REQUIRED>
+<!ATTLIST vartype scope (global | session | both) #IMPLIED>
+<!ATTLIST vartype class (status | system | both) #REQUIRED>
 <!ATTLIST vartype isdynamic (yes | no) #REQUIRED >
 
 <!-- Values specify the versions and value types -->


Modified: trunk/tools/dyndocs-optvars-generate.pl
===================================================================
--- trunk/tools/dyndocs-optvars-generate.pl	2007-07-31 09:34:15 UTC (rev 7280)
+++ trunk/tools/dyndocs-optvars-generate.pl	2007-07-31 09:58:38 UTC (rev 7281)
Changed blocks: 12, Lines Added: 21, Lines Deleted: 21; 7225 bytes

@@ -193,10 +193,10 @@
                          ($td->{$id}->{classification}->{section} eq $options->{section}));
         }
 
-        if ((exists($options->{selectservervar}) && 
-             $options->{selectservervar} eq 'yes'))
+        if ((exists($options->{selectsystemvar}) && 
+             $options->{selectsystemvar} eq 'yes'))
         {
-            next unless (exists($td->{$id}->{type}->{servervar}));
+            next unless (exists($td->{$id}->{type}->{systemvar}));
         }
         elsif ((exists($options->{selectstatusvar}) && 
              $options->{selectstatusvar} eq 'yes'))

@@ -441,11 +441,11 @@
         if (exists($item->{type}->{cmdline}->{setvar}) ||
             exists($item->{type}->{mycnf}->{setvar}));
     
-    if (exists($item->{type}->{servervar}) &&
+    if (exists($item->{type}->{systemvar}) &&
         exists($item->{type}->{statusvar}))
     {
         print $iodest (xml_row(xml_entry(xml_bold('Variable Name')),
-                                 xml_entry(xml_literal($item->{type}->{servervar}->{format} || $item->{id}))));
+                                 xml_entry(xml_literal($item->{type}->{systemvar}->{format} || $item->{id}))));
         print $iodest (xml_row(xml_entry(xml_bold('Variable Scope')),
                                  xml_entry('Both')));
         print $iodest (xml_row(xml_entry(xml_bold('Dynamic Variable')),

@@ -455,17 +455,17 @@
     elsif (exists($item->{type}->{statusvar}))
     {
         print $iodest (xml_row(xml_entry(xml_bold('Variable Name')),
-                                 xml_entry(xml_literal($item->{type}->{servervar}->{format} || $item->{id}))));
+                                 xml_entry(xml_literal($item->{type}->{systemvar}->{format} || $item->{id}))));
         print $iodest (xml_row(xml_entry(xml_bold('Variable Scope')),
                                  xml_entry('Status')));
         print $iodest (xml_row(xml_entry(xml_bold('Dynamic Variable')),
                                  xml_entry($item->{isdynamic})))
             if (exists($item->{isdynamic}));
     }
-    elsif (exists($item->{type}->{servervar}))
+    elsif (exists($item->{type}->{systemvar}))
     {
         print $iodest (xml_row(xml_entry(xml_bold('Variable Name')),
-                                 xml_entry(xml_literal($item->{type}->{servervar}->{format} || $item->{id}))));
+                                 xml_entry(xml_literal($item->{type}->{systemvar}->{format} || $item->{id}))));
         print $iodest (xml_row(xml_entry(xml_bold('Variable Scope')),
                                  xml_entry('Server')));
         print $iodest (xml_row(xml_entry(xml_bold('Dynamic Variable')),

@@ -633,7 +633,7 @@
         else
         {
             delete($options->{selectstatusvar});
-            delete($options->{selectservervar});
+            delete($options->{selectsystemvar});
             delete($options->{selectdynamicvar});
 
             if (($tableclass eq 'optvar') && 

@@ -661,9 +661,9 @@
                 ($tabletype eq 'varsummary'))
             {
                 delete($options->{preamble});
-                if ($itemid eq 'servervar')
+                if ($itemid eq 'systemvar')
                 {
-                    $options->{selectservervar} = 'yes';
+                    $options->{selectsystemvar} = 'yes';
                     $options->{selectall} = 'no';
                 }
                 elsif ($itemid eq 'statusvar')

@@ -888,7 +888,7 @@
 {
     my $id_text = xml_literal($td->{$id}->{type}->{cmdline}->{setvar} || 
                               $td->{$id}->{type}->{mycnf}->{setvar} || 
-                              $td->{$id}->{type}->{servervar}->{format} || 
+                              $td->{$id}->{type}->{systemvar}->{format} || 
                               $id);
     if (exists($td->{$id}->{xrefto}) && 
         exists($idmap->{$td->{$id}->{xrefto}}))

@@ -955,7 +955,7 @@
 {
     my $id_text = xml_literal($td->{$id}->{type}->{cmdline}->{setvar} || 
                               $td->{$id}->{type}->{mycnf}->{setvar} || 
-                              $td->{$id}->{type}->{servervar}->{format} || 
+                              $td->{$id}->{type}->{systemvar}->{format} || 
                               $id);
     if (exists($td->{$id}->{xrefto}) && 
         exists($idmap->{$td->{$id}->{xrefto}}))

@@ -1039,7 +1039,7 @@
 <entry><emphasis role="bold">Name</emphasis></entry>
 <entry><emphasis role="bold">Cmd-line</emphasis></entry>
 <entry><emphasis role="bold">Option file</emphasis></entry>
-<entry><emphasis role="bold">Server Var</emphasis></entry>
+<entry><emphasis role="bold">System Var</emphasis></entry>
 <entry><emphasis role="bold">Status Var</emphasis></entry>
 <entry><emphasis role="bold">Var Scope</emphasis></entry>
 <entry><emphasis role="bold">Dynamic</emphasis></entry>

@@ -1061,7 +1061,7 @@
 
         push @{$row},$id;
         
-        foreach my $type (qw/cmdline mycnf servervar statusvar/)
+        foreach my $type (qw/cmdline mycnf systemvar statusvar/)
         {
             if (exists($td->{$id}->{type}->{$type}))
             {

@@ -1274,7 +1274,7 @@
             push @{$row},xml_entry('');
         }
         
-        foreach my $type (qw/cmdline mycnf servervar statusvar/)
+        foreach my $type (qw/cmdline mycnf systemvar statusvar/)
         {
             if (exists($td->{$id}->{type}->{$type}))
             {

@@ -1600,9 +1600,9 @@
         $self->{tabledata}->{$self->{currentid}}->{isdynamic} = 
             $element->{Attributes}->{isdynamic} if (exists($element->{Attributes}->{isdynamic}));
 
-        if ($element->{Attributes}->{class} eq 'server')
+        if ($element->{Attributes}->{class} eq 'system')
         {
-            $self->{tabledata}->{$self->{currentid}}->{type}->{'servervar'} = {};
+            $self->{tabledata}->{$self->{currentid}}->{type}->{'systemvar'} = {};
         }
         if ($element->{Attributes}->{class} eq 'status')
         {

@@ -1611,15 +1611,15 @@
         if ($element->{Attributes}->{class} eq 'both')
         {
             $self->{tabledata}->{$self->{currentid}}->{type}->{'statusvar'} = {};
-            $self->{tabledata}->{$self->{currentid}}->{type}->{'servervar'} = {};
+            $self->{tabledata}->{$self->{currentid}}->{type}->{'systemvar'} = {};
         }
 
         foreach my $attrtype (qw/format inversion outversion/)
         {
             if (exists($element->{Attributes}->{$attrtype}))
             {
-                $self->{tabledata}->{$self->{currentid}}->{type}->{'servervar'}->{$attrtype} = $element->{Attributes}->{$attrtype}
-                if ($element->{Attributes}->{class} eq 'server');
+                $self->{tabledata}->{$self->{currentid}}->{type}->{'systemvar'}->{$attrtype} = $element->{Attributes}->{$attrtype}
+                if ($element->{Attributes}->{class} eq 'system');
                 $self->{tabledata}->{$self->{currentid}}->{type}->{'statusvar'}->{$attrtype} = $element->{Attributes}->{$attrtype}
                 if ($element->{Attributes}->{class} eq 'status');
             }