svn commit: r1470092 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/site/ lucene/site/changes/changes2html.pl

[sa...@apache.org]

Author: sarowe
Date: Sat Apr 20 00:10:09 2013
New Revision: 1470092

URL: http://svn.apache.org/r1470092
Log:
LUCENE-4944: Prepend 'v' to (currently numeric) id attributes for release sections, and fail with a nice message when encountering the same section more than once within a single release. (merged trunk r1470088)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/site/   (props changed)
    lucene/dev/branches/branch_4x/lucene/site/changes/changes2html.pl

Modified: lucene/dev/branches/branch_4x/lucene/site/changes/changes2html.pl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/site/changes/changes2html.pl?rev=1470092&r1=1470091&r2=1470092&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/site/changes/changes2html.pl (original)
+++ lucene/dev/branches/branch_4x/lucene/site/changes/changes2html.pl Sat Apr 20 00:10:09 2013
@@ -78,9 +78,9 @@ for (my $line_num = 0 ; $line_num <= $#l
     ($reldate, $relinfo) = get_release_date($release, $relinfo);
     $sections = [];
     push @releases, [ $release, $reldate, $relinfo, $sections ];
-    ($first_relid = lc($release)) =~ s/\s+/_/g
+    ($first_relid = 'v'.lc($release)) =~ s/\s+/_/g
        if ($#releases == 0 or ($#releases == 1 and not ($releases[0][0])));
-    ($second_relid = lc($release)) =~ s/\s+/_/g
+    ($second_relid = 'v'.lc($release)) =~ s/\s+/_/g
        if (   ($#releases == 1 and $releases[0][0])
            or ($#releases == 2 and not $releases[0][0]));
     $items = undef;
@@ -123,6 +123,11 @@ for (my $line_num = 0 ; $line_num <= $#l
       # Make a fake release to hold pre-release sections
       push @releases, [ undef, undef, undef, $sections ];
     }
+    for my $section (@$sections) {
+      if ($heading eq $section->[0]) {
+        die "Section '$heading' appears more than once under release '$releases[-1][0]'";
+      }
+    }
     push @$sections, [ $heading, $items ];
     $in_major_component_versions_section
       = ($heading =~ /Versions of Major Components/i);
@@ -416,7 +421,7 @@ for my $rel (@releases) {
   my $relid = '';
   if ($release) { # Pre-release sections have no release ID
     ++$relcnt;
-    ($relid = lc($release)) =~ s/\s+/_/g;
+    ($relid = 'v'.lc($release)) =~ s/\s+/_/g;
     print "<$header>";
     print "<a id=\"$relid\" href=\"javascript:toggleList('$relid')\">"
       unless ($release =~ /^20\d\d/);