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

[mcbrown]

Author: mcbrown
Date: 2007-10-26 19:11:05 +0200 (Fri, 26 Oct 2007)
New Revision: 8344

Log:
Adding support for putting the target fix and actual fix values into the tags and parsing the output correctly for open bugs



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


Modified: trunk/tools/MySQL/DynXML/Changelog.pm
===================================================================
--- trunk/tools/MySQL/DynXML/Changelog.pm	2007-10-26 16:47:17 UTC (rev 8343)
+++ trunk/tools/MySQL/DynXML/Changelog.pm	2007-10-26 17:11:05 UTC (rev 8344)
Changed blocks: 2, Lines Added: 20, Lines Deleted: 0; 1713 bytes

@@ -122,6 +122,8 @@
 # For an open bugs list, we order by the embedded category
         $options->{sortbycategory} = 1;
         $options->{showbycategory} = 1;
+        $options->{reporttargetfix} = 1;
+        $options->{fixedin} = $filter;
         $string = $self->generate_entrylist($version,$options);
         delete($options->{sortbycategory});
         delete($options->{showbycategory});

@@ -442,6 +444,24 @@
             }
         }
 
+        if (exists($options->{reporttargetfix}))
+        {
+            my $instext = '';
+            if (exists($logentries->{$md5}->{targetfix}) &&
+                exists($logentries->{$md5}->{fixedin}) &&
+                $options->{fixedin} eq $logentries->{$md5}->{fixedin})
+            {
+                $instext = sprintf('<para><emphasis role="bold">Target fix</emphasis>: %s (already fixed)</para>',
+                                   $logentries->{$md5}->{targetfix});
+            }
+            elsif (exists($logentries->{$md5}->{targetfix}))
+            {
+                $instext = sprintf('<para><emphasis role="bold">Target fix</emphasis>: %s</para>',
+                                   $logentries->{$md5}->{targetfix});
+            }
+            $message =~ s{(.*)</listitem>}{$1$instext</listitem>};
+        }
+
         foreach my $highlight (keys %{$logentries->{$md5}->{tagsbytype}->{highlight}})
         {
             my $ht = join(', ',keys %{$logentries->{$md5}->{tagsbytype}->{highlight}});


Modified: trunk/tools/MySQL/DynXML/ChangelogParser.pm
===================================================================
--- trunk/tools/MySQL/DynXML/ChangelogParser.pm	2007-10-26 16:47:17 UTC (rev 8343)
+++ trunk/tools/MySQL/DynXML/ChangelogParser.pm	2007-10-26 17:11:05 UTC (rev 8344)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 796 bytes

@@ -103,6 +103,14 @@
         }
         $self->{currententry}->{versions}->{$fullversion} = $element->{Attributes};
     }
+    elsif ($element->{Name} eq 'targetfix')
+    {
+        $self->{currententry}->{targetfix} = $element->{Attributes}->{ver};
+    }
+    elsif ($element->{Name} eq 'fixedin')
+    {
+        $self->{currententry}->{fixedin} = $element->{Attributes}->{ver};
+    }
     elsif ($element->{Name} eq 'highlight' ||
            $element->{Name} eq 'bugsauto' ||
            $element->{Name} eq 'manual')