--- test/html-webhacc/cc.cgi 2007/06/27 14:36:45 1.4 +++ test/html-webhacc/cc.cgi 2008/02/10 02:42:01 1.33 @@ -1,13 +1,12 @@ #!/usr/bin/perl use strict; +use utf8; use lib qw[/home/httpd/html/www/markup/html/whatpm - /home/wakaba/work/manakai/lib - /home/wakaba/public_html/-temp/wiki/lib]; + /home/wakaba/work/manakai2/lib]; use CGI::Carp qw[fatalsToBrowser]; use Scalar::Util qw[refaddr]; - -use SuikaWiki::Input::HTTP; ## TODO: Use some better CGI module +use Time::HiRes qw/time/; sub htescape ($) { my $s = $_[0]; @@ -15,24 +14,28 @@ $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 -my $http = SuikaWiki::Input::HTTP->new; - -## TODO: _charset_ - - my $input_format = $http->parameter ('i') || 'text/html'; - my $inner_html_element = $http->parameter ('e'); - my $input_uri = 'thismessage:/'; + use Message::CGI::HTTP; + my $http = Message::CGI::HTTP->new; - 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->get_meta_variable ('PATH_INFO') ne '/') { + print STDOUT "Status: 404 Not Found\nContent-Type: text/plain; charset=us-ascii\n\n400"; exit; } + binmode STDOUT, ':utf8'; + $| = 1; + + require Message::DOM::DOMImplementation; + my $dom = Message::DOM::DOMImplementation->new; + + load_text_catalog ('en'); ## TODO: conneg + my @nav; print STDOUT qq[Content-Type: text/html; charset=utf-8 @@ -43,99 +46,263 @@ -

Web Document Conformance Checker (beta)

+

Web Document Conformance Checker +(beta)

+]; + + $| = 0; + my $input = get_input_document ($http, $dom); + my $char_length = 0; + my %time; + print qq[
+
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; - my $doc; - my $el; +if (defined $input->{s}) { + $char_length = length $input->{s}; - if ($input_format eq 'text/html') { - require Encode; - require Whatpm::HTML; - - $s = Encode::decode ('utf-8', $s); - - print STDOUT qq[ + print STDOUT qq[ +
Base URI
+
<@{[htescape $input->{base_uri}]}>
+
Internet Media Type
+
@{[htescape $input->{media_type}]} + @{[$input->{media_type_overridden} ? '(overridden)' : defined $input->{official_type} ? $input->{media_type} eq $input->{official_type} ? '' : '(sniffed; official type is: '.htescape ($input->{official_type}).')' : '(sniffed)']}
Character Encoding
-
(none)
+
@{[defined $input->{charset} ? ''.htescape ($input->{charset}).'' : '(none)']} + @{[$input->{charset_overridden} ? '(overridden)' : '']}
+
Length
+
$char_length byte@{[$char_length == 1 ? '' : 's']}
+]; -
-

Document Source

+ my $result = {conforming_min => 1, conforming_max => 1}; + check_and_print ($input => $result); + print_result_section ($result); +} else { + print STDOUT qq[
]; + print_result_input_error_section ($input); +} + + print STDOUT qq[ + + + ]; - push @nav, ['#source-string' => 'Source']; - print_source_string (\$s); - print STDOUT qq[ - -
-

Parse Errors

+ for (qw/decode parse parse_html parse_xml parse_manifest + check check_manifest/) { + next unless defined $time{$_}; + open my $file, '>>', ".cc-$_.txt" or die ".cc-$_.txt: $!"; + print $file $char_length, "\t", $time{$_}, "\n"; + } -
+exit; + +sub add_error ($$$) { + my ($layer, $err, $result) = @_; + if (defined $err->{level}) { + if ($err->{level} eq 's') { + $result->{$layer}->{should}++; + $result->{$layer}->{score_min} -= 2; + $result->{conforming_min} = 0; + } elsif ($err->{level} eq 'w' or $err->{level} eq 'g') { + $result->{$layer}->{warning}++; + } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') { + $result->{$layer}->{unsupported}++; + $result->{unsupported} = 1; + } else { + $result->{$layer}->{must}++; + $result->{$layer}->{score_max} -= 2; + $result->{$layer}->{score_min} -= 2; + $result->{conforming_min} = 0; + $result->{conforming_max} = 0; + } + } else { + $result->{$layer}->{must}++; + $result->{$layer}->{score_max} -= 2; + $result->{$layer}->{score_min} -= 2; + $result->{conforming_min} = 0; + $result->{conforming_max} = 0; + } +} # add_error + +sub check_and_print ($$) { + my ($input, $result) = @_; + $input->{id_prefix} = ''; + #$input->{nested} = 1/0; + + print_http_header_section ($input, $result); + + my $doc; + my $el; + my $manifest; + + if ($input->{media_type} eq 'text/html') { + ($doc, $el) = print_syntax_error_html_section ($input, $result); + print_source_string_section + (\($input->{s}), $input->{charset} || $doc->input_encoding); + } elsif ({ + 'text/xml' => 1, + 'application/atom+xml' => 1, + 'application/rss+xml' => 1, + 'application/svg+xml' => 1, + 'application/xhtml+xml' => 1, + 'application/xml' => 1, + }->{$input->{media_type}}) { + ($doc, $el) = print_syntax_error_xml_section ($input, $result); + print_source_string_section (\($input->{s}), $doc->input_encoding); + } elsif ($input->{media_type} eq 'text/cache-manifest') { +## TODO: MUST be text/cache-manifest + $manifest = print_syntax_error_manifest_section ($input, $result); + print_source_string_section (\($input->{s}), 'utf-8'); + } else { + ## TODO: Change HTTP status code?? + print_result_unknown_type_section ($input, $result); + } + + if (defined $doc or defined $el) { + print_structure_dump_dom_section ($input, $doc, $el); + my $elements = print_structure_error_dom_section + ($input, $doc, $el, $result); + print_table_section ($input, $elements->{table}) if @{$elements->{table}}; + print_listing_section ({ + id => 'identifiers', label => 'IDs', heading => 'Identifiers', + }, $input, $elements->{id}) if keys %{$elements->{id}}; + print_listing_section ({ + id => 'terms', label => 'Terms', heading => 'Terms', + }, $input, $elements->{term}) if keys %{$elements->{term}}; + print_listing_section ({ + id => 'classes', label => 'Classes', heading => 'Classes', + }, $input, $elements->{class}) if keys %{$elements->{class}}; + } elsif (defined $manifest) { + print_structure_dump_manifest_section ($input, $manifest); + print_structure_error_manifest_section ($input, $manifest, $result); + } +} # check_and_print + +sub print_http_header_section ($$) { + my ($input, $result) = @_; + return unless defined $input->{header_status_code} or + defined $input->{header_status_text} or + @{$input->{header_field}}; + + push @nav, ['#source-header' => 'HTTP Header'] unless $input->{nested}; + print STDOUT qq[
+

HTTP Header

+ +

Note: Due to the limitation of the +network library in use, the content of this section might +not be the real header.

+ + ]; - push @nav, ['#parse-errors' => 'Parse Error']; + + if (defined $input->{header_status_code}) { + print STDOUT qq[]; + print STDOUT qq[]; + } + if (defined $input->{header_status_text}) { + print STDOUT qq[]; + print STDOUT qq[]; + } + + for (@{$input->{header_field}}) { + print STDOUT qq[]; + print STDOUT qq[]; + } + + print STDOUT qq[
Status code@{[htescape ($input->{header_status_code})]}
Status text@{[htescape ($input->{header_status_text})]}
@{[htescape ($_->[0])]}@{[htescape ($_->[1])]}
]; +} # print_http_header_section + +sub print_syntax_error_html_section ($$) { + my ($input, $result) = @_; + + require Encode; + require Whatpm::HTML; + + print STDOUT qq[ +
+

Parse Errors

+ +
]; + push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested}; 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[
], get_error_level_label (\%opt); + print STDOUT qq[$msg
\n]; + + add_error ('syntax', \%opt => $result); }; - $doc = $dom->create_document; + my $doc = $dom->create_document; + my $el; + my $inner_html_element = $http->get_parameter ('e'); if (defined $inner_html_element and length $inner_html_element) { + $input->{charset} ||= 'windows-1252'; ## TODO: for now. + my $time1 = time; + my $t = Encode::decode ($input->{charset}, $input->{s}); + $time{decode} = time - $time1; + $el = $doc->create_element_ns ('http://www.w3.org/1999/xhtml', [undef, $inner_html_element]); - Whatpm::HTML->set_inner_html ($el, $s, $onerror); + $time1 = time; + Whatpm::HTML->set_inner_html ($el, $t, $onerror); + $time{parse} = time - $time1; } else { - Whatpm::HTML->parse_string ($s => $doc, $onerror); + my $time1 = time; + Whatpm::HTML->parse_byte_string + ($input->{charset}, $input->{s} => $doc, $onerror); + $time{parse_html} = time - $time1; } - + $doc->manakai_charset ($input->{official_charset}) + if defined $input->{official_charset}; + + print STDOUT qq[
]; + + return ($doc, $el); +} # print_syntax_error_html_section + +sub print_syntax_error_xml_section ($$) { + my ($input, $result) = @_; + + require Message::DOM::XMLParserTemp; + 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)
- - - -
-

Document Source

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

Parse Errors

-
-]; - push @nav, ['#parse-errors' => 'Parse Error']; +
]; + push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{prefix}; my $onerror = sub { my $err = shift; @@ -143,98 +310,92 @@ print STDOUT qq[
Line $line column ]; print STDOUT $err->location->column_number, "
"; print STDOUT htescape $err->text, "
\n"; - return 1; - }; - open my $fh, '<', \$s; - $doc = Message::DOM::XMLParserTemp->parse_byte_stream - ($fh => $dom, $onerror, charset => 'utf-8'); + add_error ('syntax', {type => $err->text, + level => [ + $err->SEVERITY_FATAL_ERROR => 'm', + $err->SEVERITY_ERROR => 'm', + $err->SEVERITY_WARNING => 's', + ]->[$err->severity]} => $result); - print STDOUT qq[ -
-
-]; - } else { - print STDOUT qq[ - -
+ return 1; + }; -
-

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

-
-]; - push @nav, ['#result-summary' => 'Result']; - } + my $time1 = time; + open my $fh, '<', \($input->{s}); + my $doc = Message::DOM::XMLParserTemp->parse_byte_stream + ($fh => $dom, $onerror, charset => $input->{charset}); + $time{parse_xml} = time - $time1; + $doc->manakai_charset ($input->{official_charset}) + if defined $input->{official_charset}; + + print STDOUT qq[]; + return ($doc, undef); +} # print_syntax_error_xml_section - if (defined $doc or defined $el) { - print STDOUT qq[ -
-

Document Tree

-]; - push @nav, ['#document-tree' => 'Tree']; +sub print_syntax_error_manifest_section ($$) { + my ($input, $result) = @_; - print_document_tree ($el || $doc); + require Whatpm::CacheManifest; - print STDOUT qq[ -
+ print STDOUT qq[ +
+

Parse Errors

-
-

Document Errors

+
]; + push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested}; -
-]; - push @nav, ['#document-errors' => 'Document Error']; + my $onerror = sub { + my (%opt) = @_; + my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}); + print STDOUT qq[
], get_error_label ($input, \%opt), + qq[
]; + $type =~ tr/ /-/; + $type =~ s/\|/%7C/g; + $msg .= qq[ [Description]]; + print STDOUT qq[
], get_error_level_label (\%opt); + print STDOUT qq[$msg
\n]; - require Whatpm::ContentChecker; - my $onerror = sub { - my %opt = @_; - print STDOUT qq[
], - htescape get_node_path ($opt{node}), - "
\n
", htescape $opt{type}, "
\n"; - }; + add_error ('syntax', \%opt => $result); + }; - if ($el) { - Whatpm::ContentChecker->check_element ($el, $onerror); - } else { - Whatpm::ContentChecker->check_document ($doc, $onerror); + my $time1 = time; + my $manifest = Whatpm::CacheManifest->parse_byte_string + ($input->{s}, $input->{uri}, $input->{base_uri}, $onerror); + $time{parse_manifest} = time - $time1; + + print STDOUT qq[
]; + + return $manifest; +} # print_syntax_error_manifest_section + +sub print_source_string_section ($$) { + require Encode; + my $enc = Encode::find_encoding ($_[1]); ## TODO: charset name -> Perl name + return unless $enc; + + my $s = \($enc->decode (${$_[0]})); + my $i = 1; + push @nav, ['#source-string' => 'Source'] unless $input->{nested}; + print STDOUT qq[
+

Document Source

+
    \n]; + if (length $$s) { + while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) { + print STDOUT qq[
  1. ], htescape $1, + "
  2. \n"; + $i++; } - - print STDOUT qq[ - -
-]; - } - - ## TODO: Show result - - print STDOUT qq[ - - - -]; - -exit; - -sub print_source_string ($) { - my $s = $_[0]; - my $i = 1; - print STDOUT qq[
    \n]; - while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) { - print STDOUT qq[
  1. ], htescape $1, "
  2. \n"; - $i++; - } - if ($$s =~ /\G([^\x0A]+)/gc) { - print STDOUT qq[
  3. ], htescape $1, "
  4. \n"; + if ($$s =~ /\G([^\x0A]+)/gc) { + print STDOUT qq[
  5. ], htescape $1, + "
  6. \n"; + } + } else { + print STDOUT q[
  7. ]; } - print STDOUT "
"; -} # print_input_string + print STDOUT "
"; +} # print_input_string_section sub print_document_tree ($) { my $node = shift; @@ -248,7 +409,7 @@ next; } - my $node_id = 'node-'.refaddr $child; + my $node_id = $input->{id_prefix} . 'node-'.refaddr $child; my $nt = $child->node_type; if ($nt == $child->ELEMENT_NODE) { my $child_nsuri = $child->namespace_uri; @@ -259,15 +420,17 @@ $r .= ''; } - 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 +439,44 @@ } 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>