You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/05/16 16:08:53 UTC
svn commit: r1483379 - in /lucene/dev/branches/lucene_solr_4_3: ./ lucene/
lucene/site/ lucene/site/changes/changes2html.pl
Author: shalin
Date: Thu May 16 14:08:52 2013
New Revision: 1483379
URL: http://svn.apache.org/r1483379
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 branch_4x r1470092)
Modified:
lucene/dev/branches/lucene_solr_4_3/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/site/changes/changes2html.pl
Modified: lucene/dev/branches/lucene_solr_4_3/lucene/site/changes/changes2html.pl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/lucene/site/changes/changes2html.pl?rev=1483379&r1=1483378&r2=1483379&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/lucene/site/changes/changes2html.pl (original)
+++ lucene/dev/branches/lucene_solr_4_3/lucene/site/changes/changes2html.pl Thu May 16 14:08:52 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/);