--- test/html-webhacc/cc.cgi 2007/06/27 14:36:45 1.4 +++ test/html-webhacc/cc.cgi 2007/07/17 13:52:54 1.13 @@ -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 @@ -23,16 +25,21 @@ ## TODO: _charset_ - my $input_format = $http->parameter ('i') || 'text/html'; - my $inner_html_element = $http->parameter ('e'); - my $input_uri = 'thismessage:/'; - - my $s = $http->parameter ('s'); - if (length $s > 1000_000) { - print STDOUT "Status: 400 Document Too Long\nContent-Type: text/plain; charset=us-ascii\n\nToo long"; + if ($http->meta_variable ('PATH_INFO') ne '/') { + print STDOUT "Status: 404 Not Found\nContent-Type: text/plain; charset=us-ascii\n\n400"; exit; } + binmode STDOUT, ':utf8'; + + 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; print STDOUT qq[Content-Type: text/html; charset=utf-8 @@ -43,98 +50,94 @@ -

Web Document Conformance Checker (beta)

+

Web Document Conformance Checker +(beta)

+
Request URI
+
<@{[htescape $input->{request_uri}]}>
Document URI
-
<@{[htescape $input_uri]}>
-
Internet Media Type
-
@{[htescape $input_format]}
+
<@{[htescape $input->{uri}]}>
]; # no
yet push @nav, ['#document-info' => 'Information']; - require Message::DOM::DOMImplementation; - my $dom = Message::DOM::DOMImplementation->____new; +if (defined $input->{s}) { + + print STDOUT qq[ +
Base URI
+
<@{[htescape $input->{base_uri}]}>
+
Internet Media Type
+
@{[htescape $input->{media_type}]} + @{[$input->{media_type_overridden} ? '(overridden)' : '']}
+
Character Encoding
+
@{[defined $input->{charset} ? ''.htescape ($input->{charset}).'' : '(none)']} + @{[$input->{charset_overridden} ? '(overridden)' : '']}
+ +
+]; + + print_http_header_section ($input); + my $doc; my $el; - if ($input_format eq 'text/html') { + if ($input->{media_type} eq 'text/html') { require Encode; require Whatpm::HTML; + + $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now. - $s = Encode::decode ('utf-8', $s); + my $t = Encode::decode ($input->{charset}, $input->{s}); print STDOUT qq[ -
Character Encoding
-
(none)
- - - -
-

Document Source

-]; - push @nav, ['#source-string' => 'Source']; - print_source_string (\$s); - print STDOUT qq[ -
-

Parse Errors

-
-]; +
]; push @nav, ['#parse-errors' => 'Parse Error']; my $onerror = sub { my (%opt) = @_; + my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}); if ($opt{column} > 0) { - print STDOUT qq[
Line $opt{line} column $opt{column}
\n]; + print STDOUT qq[
Line $opt{line} column $opt{column}
\n]; } else { - $opt{line}--; - print STDOUT qq[
Line $opt{line}
\n]; + $opt{line} = $opt{line} - 1 || 1; + print STDOUT qq[
Line $opt{line}
\n]; } - print STDOUT qq[
@{[htescape $opt{type}]}
\n]; + $type =~ tr/ /-/; + $type =~ s/\|/%7C/g; + $msg .= qq[ [Description]]; + print STDOUT qq[
$msg
\n]; }; $doc = $dom->create_document; if (defined $inner_html_element and length $inner_html_element) { $el = $doc->create_element_ns ('http://www.w3.org/1999/xhtml', [undef, $inner_html_element]); - Whatpm::HTML->set_inner_html ($el, $s, $onerror); + Whatpm::HTML->set_inner_html ($el, $t, $onerror); } else { - Whatpm::HTML->parse_string ($s => $doc, $onerror); + Whatpm::HTML->parse_string ($t => $doc, $onerror); } - print STDOUT qq[ -
+ print STDOUT qq[
]; - } elsif ($input_format eq 'application/xhtml+xml') { - require Message::DOM::XMLParserTemp; - require Encode; - - my $t = Encode::decode ('utf-8', $s); - print STDOUT qq[ -
Character Encoding
-
(none)
- - + print_source_string_section (\($input->{s}), $input->{charset}); + } elsif ({ + 'text/xml' => 1, + 'application/xhtml+xml' => 1, + 'application/xml' => 1, + }->{$input->{media_type}}) { + require Message::DOM::XMLParserTemp; -
-

Document Source

-]; - push @nav, ['#source-string' => 'Source']; - print_source_string (\$t); print STDOUT qq[ -
-

Parse Errors

-
-]; +
]; push @nav, ['#parse-errors' => 'Parse Error']; my $onerror = sub { @@ -146,21 +149,20 @@ return 1; }; - open my $fh, '<', \$s; + open my $fh, '<', \($input->{s}); $doc = Message::DOM::XMLParserTemp->parse_byte_stream - ($fh => $dom, $onerror, charset => 'utf-8'); + ($fh => $dom, $onerror, charset => $input->{charset}); - print STDOUT qq[ -
+ print STDOUT qq[
+ ]; + print_source_string_section (\($input->{s}), $doc->input_encoding); } else { + ## TODO: Change HTTP status code?? print STDOUT qq[ - - -
-

Media type @{[htescape $input_format]} is not supported!

+

Media type @{[htescape $input->{media_type}]} is not supported!

]; push @nav, ['#result-summary' => 'Result']; @@ -182,31 +184,133 @@

Document Errors

-
-]; +
]; push @nav, ['#document-errors' => 'Document Error']; require Whatpm::ContentChecker; my $onerror = sub { my %opt = @_; - print STDOUT qq[
], - htescape get_node_path ($opt{node}), - "
\n
", htescape $opt{type}, "
\n"; + 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"; }; + my $elements; if ($el) { - Whatpm::ContentChecker->check_element ($el, $onerror); + $elements = Whatpm::ContentChecker->check_element ($el, $onerror); } else { - Whatpm::ContentChecker->check_document ($doc, $onerror); + $elements = Whatpm::ContentChecker->check_document ($doc, $onerror); } - print STDOUT qq[ -
+ print STDOUT qq[
]; + + if (@{$elements->{table}}) { + require JSON; + + print STDOUT qq[ +
+

Tables

+ + + + +]; + + my $i = 0; + for my $table_el (@{$elements->{table}}) { + $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}) { + next unless $_; + delete $_->{element}; + } + + for (@{$table->{row_group}}) { + next unless $_; + next unless $_->{element}; + $_->{type} = $_->{element}->manakai_local_name; + delete $_->{element}; + } + + for (@{$table->{cell}}) { + next unless $_; + for (@{$_}) { + next unless $_; + for (@$_) { + $_->{id} = refaddr $_->{element} if defined $_->{element}; + delete $_->{element}; + $_->{is_header} = $_->{is_header} ? 1 : 0; + } + } + } + + print STDOUT '
]; + } + + print STDOUT qq[
]; + } + + if (keys %{$elements->{id}}) { + 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}}) { + print STDOUT qq[ +
+

Terms

+ +
+]; + for my $term (sort {$a cmp $b} keys %{$elements->{term}}) { + print STDOUT qq[
@{[htescape $term]}
]; + for (@{$elements->{term}->{$term}}) { + print STDOUT qq[
].get_node_link ($_).qq[
]; + } + } + print STDOUT qq[
]; + } } ## TODO: Show result +} else { + print STDOUT qq[ + + + +
+

Input Error: @{[htescape ($input->{error_status_text})]}

+
+]; + push @nav, ['#result-summary' => 'Result']; + +} print STDOUT qq[ '; } - if ($node->has_child_nodes) { + if ($child->has_child_nodes) { $r .= '
    '; - unshift @node, @{$child->child_nodes}, '
'; + unshift @node, @{$child->child_nodes}, ''; + } else { + $r .= ''; } } elsif ($nt == $child->TEXT_NODE) { $r .= qq'
  • ' . htescape ($child->data) . '
    • '; @@ -276,16 +427,29 @@ } elsif ($nt == $child->COMMENT_NODE) { $r .= qq'
  • <!--' . htescape ($child->data) . '-->
    • '; } elsif ($nt == $child->DOCUMENT_NODE) { - $r .= qq'
  • Document
    • '; + $r .= qq'
  • Document'; + $r .= qq[]; if ($child->has_child_nodes) { - $r .= '
      '; - unshift @node, @{$child->child_nodes}, '
    '; + $r .= '
      '; + unshift @node, @{$child->child_nodes}, '
    • '; } } elsif ($nt == $child->DOCUMENT_TYPE_NODE) { - $r .= qq'
  • <!DOCTYPE>