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

[mcbrown]

Author: mcbrown
Date: 2007-12-14 11:49:44 +0100 (Fri, 14 Dec 2007)
New Revision: 9312

Log:
Improving the collision detection in changelog entries
Adding a warning if there is a duplicate entry
Removing un-needed HTML link generator - this is handled by the main IDMap component now



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


Modified: trunk/tools/MySQL/DynXML/ChangelogParser.pm
===================================================================
--- trunk/tools/MySQL/DynXML/ChangelogParser.pm	2007-12-14 10:15:05 UTC (rev 9311)
+++ trunk/tools/MySQL/DynXML/ChangelogParser.pm	2007-12-14 10:49:44 UTC (rev 9312)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 0; 1386 bytes

@@ -214,6 +214,10 @@
             $md5text .= $self->{currententry}->{messagebyversion}->{$subver};
         }
 
+        $md5text .= join('',keys %{$self->{currententry}->{versions}});
+        $md5text .= join('',@{$self->{currententry}->{bugs}});
+        $md5text .= $self->{currententry}->{type};
+
         if (length($md5text) == 0)
         {
             print STDERR "FATAL: During parsing - no default message or version specific message\n";

@@ -222,6 +226,13 @@
         }
 
         my $md5 = md5_hex(encode_utf8($md5text));
+        if (exists($self->{logentries}->{$md5}))
+        {
+            print STDERR "Found another record with the same md5 value - perhaps they should be merged?\n";
+            print STDERR "Existing record: ",Dumper($self->{logentries}->{$md5}),"\n";
+            print STDERR "New record: ",Dumper($self->{currententry}),"\n";
+            print STDERR "Can't reliably merge these automatically; new entry will overwrite the old\n";
+        }
         $self->{logentries}->{$md5} = $self->{currententry};
 
         foreach my $version (keys %{$self->{currententry}->{versions}})


Modified: trunk/tools/MySQL/DynXML/Optvar.pm
===================================================================
--- trunk/tools/MySQL/DynXML/Optvar.pm	2007-12-14 10:15:05 UTC (rev 9311)
+++ trunk/tools/MySQL/DynXML/Optvar.pm	2007-12-14 10:49:44 UTC (rev 9312)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 25; 1015 bytes

@@ -1215,29 +1215,4 @@
     return (keys %{$words});
 }
 
-sub generate_html_xref
-{
-    my ($idmap,$idref) = @_;
-
-    my $urlcore = 'http://dev.mysql.com/doc/';
-    my $url;
-
-    if ($idmap->{byid}->{$idref}->{type} =~ m/^(appendix|article|book|part|chapter|example|glossary|preface|refentry|refsection|section)$/i)
-    {
-        $url = sprintf('%s%s/%s.html',
-                       $urlcore,
-                       $idmap->{byid}->{$idref}->{urlbase},
-                       $idref);
-    }
-    else
-    {
-        $url = sprintf('%s%s/%s.html#%s',
-                       $urlcore,
-                       $idmap->{byid}->{$idref}->{urlbase},
-                       $idmap->{byid}->{$idref}->{parent},
-                       $idref);
-    }
-    return($url);
-}
-
 1;