--- test/html-webhacc/cc.cgi 2007/07/16 08:38:48 1.10 +++ test/html-webhacc/cc.cgi 2007/07/17 14:28:20 1.14 @@ -15,7 +15,9 @@ $s =~ s//>/g; $s =~ s/"/"/g; - $s =~ s!([\x00-\x09\x0B-\x1F\x7F-\x80])!sprintf 'U+%04X', ord $1!ge; + $s =~ s{([\x00-\x09\x0B-\x1F\x7F-\xA0\x{FEFF}\x{FFFC}-\x{FFFF}])}{ + sprintf 'U+%04X', ord $1; + }ge; return $s; } # htescape @@ -28,12 +30,12 @@ exit; } + binmode STDOUT, ':utf8'; + $| = 1; + require Message::DOM::DOMImplementation; my $dom = Message::DOM::DOMImplementation->new; - my $input = get_input_document ($http, $dom); - my $inner_html_element = $http->parameter ('e'); - load_text_catalog ('en'); ## TODO: conneg my @nav; @@ -46,8 +48,15 @@ -

Web Document Conformance Checker (beta)

+

Web Document Conformance Checker +(beta)

+]; + + $| = 0; + my $input = get_input_document ($http, $dom); + my $inner_html_element = $http->parameter ('e'); + print qq[
Request URI
@@ -94,16 +103,16 @@ my $onerror = sub { my (%opt) = @_; - my ($cls, $msg) = get_text ($opt{type}, $opt{level}); + my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}); if ($opt{column} > 0) { print STDOUT qq[
Line $opt{line} column $opt{column}
\n]; } else { $opt{line} = $opt{line} - 1 || 1; print STDOUT qq[
Line $opt{line}
\n]; } - $opt{type} =~ tr/ /-/; - $opt{type} =~ s/\|/%7C/g; - $msg .= qq[ [Description]]; + $type =~ tr/ /-/; + $type =~ s/\|/%7C/g; + $msg .= qq[ [Description]]; print STDOUT qq[
$msg
\n]; }; @@ -185,11 +194,10 @@ require Whatpm::ContentChecker; my $onerror = sub { my %opt = @_; - my ($cls, $msg) = get_text ($opt{type}, $opt{level}); - $opt{type} = $opt{level} . ':' . $opt{type} if defined $opt{level}; - $opt{type} =~ tr/ /-/; - $opt{type} =~ s/\|/%7C/g; - $msg .= qq[ [Description]]; + my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}); + $type =~ tr/ /-/; + $type =~ s/\|/%7C/g; + $msg .= qq[ [Description]]; print STDOUT qq[
] . get_node_link ($opt{node}) . qq[
\n
], $msg, "
\n"; }; @@ -208,6 +216,7 @@ if (@{$elements->{table}}) { require JSON; + push @nav, ['#tables' => 'Tables']; print STDOUT qq[

Tables

@@ -224,7 +233,9 @@ $i++; print STDOUT qq[

] . get_node_link ($table_el) . q[

]; - + + ## TODO: Make |ContentChecker| return |form_table| result + ## so that this script don't have to run the algorithm twice. my $table = Whatpm::HTMLTable->form_table ($table_el); for (@{$table->{column_group}}, @{$table->{column}}, $table->{caption}) { @@ -246,6 +257,7 @@ for (@$_) { $_->{id} = refaddr $_->{element} if defined $_->{element}; delete $_->{element}; + $_->{is_header} = $_->{is_header} ? 1 : 0; } } } @@ -258,7 +270,25 @@ print STDOUT qq[
]; } + if (keys %{$elements->{id}}) { + push @nav, ['#identifiers' => 'IDs']; + print STDOUT qq[ +
+

Identifiers

+ +
+]; + for my $id (sort {$a cmp $b} keys %{$elements->{id}}) { + print STDOUT qq[
@{[htescape $id]}
]; + for (@{$elements->{id}->{$id}}) { + print STDOUT qq[
].get_node_link ($_).qq[
]; + } + } + print STDOUT qq[
]; + } + if (keys %{$elements->{term}}) { + push @nav, ['#terms' => 'Terms']; print STDOUT qq[

Terms

@@ -273,6 +303,23 @@ } print STDOUT qq[
]; } + + if (keys %{$elements->{class}}) { + push @nav, ['#classes' => 'Classes']; + print STDOUT qq[ +
+

Classes

+ +
+]; + for my $class (sort {$a cmp $b} keys %{$elements->{class}}) { + print STDOUT qq[
@{[htescape $class]}
]; + for (@{$elements->{class}->{$class}}) { + print STDOUT qq[
].get_node_link ($_).qq[
]; + } + } + print STDOUT qq[
]; + } } ## TODO: Show result @@ -496,13 +543,13 @@ $msg =~ s{\$([0-9]+)}{ defined $arg[$1] ? htescape ($arg[$1]) : '(undef)'; }ge; - return ($Msg->{$type}->[0], $msg); + return ($type, $Msg->{$type}->[0], $msg); } elsif ($type =~ s/:([^:]*)$//) { unshift @arg, $1; redo; } } - return ('', htescape ($_[0])); + return ($type, '', htescape ($_[0])); } # get_text } @@ -669,4 +716,4 @@ =cut -## $Date: 2007/07/16 08:38:48 $ +## $Date: 2007/07/17 14:28:20 $