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

[mcbrown]

Author: mcbrown
Date: 2008-07-25 10:40:45 +0200 (Fri, 25 Jul 2008)
New Revision: 11376

Log:
Fixing the issue where we get duplicate bug entries in the output when using <import>, if the imports ultimate include the bug multiple times. 



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


Modified: trunk/tools/MySQL/DynXML/Changelog.pm
===================================================================
--- trunk/tools/MySQL/DynXML/Changelog.pm	2008-07-25 08:23:36 UTC (rev 11375)
+++ trunk/tools/MySQL/DynXML/Changelog.pm	2008-07-25 08:40:45 UTC (rev 11376)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 1; 1213 bytes

@@ -826,10 +826,20 @@
         {
             foreach my $parentversion (keys %{$$entries->{versions}->{$version}->{includes}})
             {
+
+# Create a quick hash based on the current bug list, so we can remove dupes from the list
+
+                my $bugdupes = {};
+                foreach my $entry (@{$$entries->{entriesbyversion}->{$version}})
+                {
+                    $bugdupes->{$entry} = 1;
+                }
+
                 foreach my $entry (@{$$entries->{entriesbyversion}->{$parentversion}})
                 {
 # Add the entry to the entries for this version
-                    push @{$$entries->{entriesbyversion}->{$version}},$entry;
+                    push @{$$entries->{entriesbyversion}->{$version}},$entry
+                        unless (exists($bugdupes->{$entry}));
 
 # Add the version to the version for this entry
                     $$entries->{logentries}->{$entry}->{versions}->{$version}->{ver} = $version;