- From: fantasai <fantasai.lists@inkedblade.net>
- Date: Wed, 27 Jun 2007 16:59:38 -0400
- To: "public-css-testsuite@w3.org" <public-css-testsuite@w3.org>
- Message-ID: <4682CFBA.80307@inkedblade.net>
I removed the indexer script's dependence on having the primary spec section number in the file name. (The information is now gleaned from the help links.) I also fixed a help link regex problem that caused several of Boris Zbarksy's tests to be left out of the generated index. Diff attached. ~fantasai
Index: indexer.pm
===================================================================
RCS file: /sources/public/CSS/CSS2.1-test-suite/lib/indexer.pm,v
retrieving revision 1.2
diff -u -r1.2 indexer.pm
--- indexer.pm 21 Jun 2007 05:46:50 -0000 1.2
+++ indexer.pm 27 Jun 2007 20:54:09 -0000
@@ -51,17 +51,13 @@
if ($id =~ m/^t(\d\d)(\d\d)?(\d\d)?-[a-z0-9\-]+-([a-f])(?:-([a-z]+))?$/) {
# Collect Metadata
- local $_ = $1;
- $_ .= '.'.$2 if $2;
- $_ .= '.'.$3 if $3;
- my %data = ( 'primary' => $_,
- 'type' => $4,
+ my %data = ( 'type' => $4,
'flags' => $5 || '' );
- $data{'primary'} =~ s/0(\d)/$1/g;
my @links = getHeadData($file, $id);
$data{'title'} = shift @links;
$data{'links'} = \@links;
+ $data{'primary'} = @links[0];
# Build Test Database
$testdata{$id} = \%data;
@@ -99,7 +95,7 @@
$title =~ s/$titlestr//;
# Collect rel="help" URLs
- @links = /<link\s.*?rel="\s*help\s*".*?>/g;
+ @links = /<link\s.*?rel="\s*help\s*".*?>/gsm;
foreach (@links) {
/href="$specroot(.+?)"/;
$_ = $1;
@@ -116,8 +112,8 @@
open OUT, ">$output" or die "index::sections could not open output file $output: $!";
while (<TMPL>) {
- if (/(\s*)<!-- TESTS ([A-Z\d\.]+) <(.+)> -->/) {
- my ($indent, $primary, $section) = ($1, $2, $3);
+ if (/(\s*)<!-- TESTS [A-Z\d\.]+ <(.+)> -->/) {
+ my ($indent, $section) = ($1, $2);
next if (!defined $linkindex{$section}); # no tests for this section
foreach my $test (@{$linkindex{$section}}) {
@@ -125,7 +121,7 @@
# highlight and ID test if this is its primary section
my ($hlstart, $hlend, $idstr) = ('', '', '');
- if ($data{'primary'} eq $primary) {
+ if ($data{'primary'} eq $section) {
$hlstart = '<strong>';
$hlend = '</strong>';
$idstr = qq' id="$test"';
Received on Wednesday, 27 June 2007 20:59:49 UTC