svn commit - mysqldoc@docsrva: r10438 - trunk/tools/MySQL/DynXML

[mcbrown]

Author: mcbrown
Date: 2008-04-10 11:33:37 +0200 (Thu, 10 Apr 2008)
New Revision: 10438

Log:
Fixing the error where some non-types where appearing as types (i.e. non-systemvars in systemvar lists). This was due to phantom generation of the hash structure holding the informaiton when building the version data

We now do it the long way round to prevent creating the empty hash that generates bad data



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


Modified: trunk/tools/MySQL/DynXML/Optvar.pm
===================================================================
--- trunk/tools/MySQL/DynXML/Optvar.pm	2008-04-10 02:13:08 UTC (rev 10437)
+++ trunk/tools/MySQL/DynXML/Optvar.pm	2008-04-10 09:33:37 UTC (rev 10438)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 4; 1655 bytes

@@ -168,7 +168,7 @@
     $self->set_version_data($self->{tdcache}->{$command},[keys %{$self->{tdcache}->{$command}}],$options);
 
     my $string = '';
-    
+
     if ($options->{inserttype} !~ m/^(optvar|option)$/)
     {
         print STDERR "WARNING: I don't know the table class $options->{inserttype} in $item (ignoring)\n";

@@ -308,11 +308,24 @@
         if (exists($td->{$id}->{type}->{system}) ||
             exists($td->{$id}->{type}->{status}))
         {
-            $td->{$id}->{isdynamic} = $td->{$id}->{type}->{system}->{isdynamic} || $td->{$id}->{type}->{status}->{isdynamic};
-            $td->{$id}->{scope} = $td->{$id}->{type}->{system}->{scope} || $td->{$id}->{type}->{status}->{scope};
+            if (exists($td->{$id}->{type}->{system}))
+            {
+                $td->{$id}->{isdynamic} = $td->{$id}->{type}->{system}->{isdynamic};
+            }
+            elsif (exists($td->{$id}->{type}->{status}))
+            {
+                $td->{$id}->{isdynamic} = $td->{$id}->{type}->{status}->{isdynamic};
+            }
+            if (exists($td->{$id}->{type}->{system}))
+            {
+                $td->{$id}->{scope} = $td->{$id}->{type}->{system}->{scope};
+            }
+            elsif (exists($td->{$id}->{type}->{status}))
+            {
+                $td->{$id}->{scope} = $td->{$id}->{type}->{status}->{scope};
+            }
         }
     }
-
 }
 
 sub gen_sorted_idlist