--- test/html-webhacc/cc.cgi 2007/11/05 09:33:52 1.23 +++ test/html-webhacc/cc.cgi 2008/07/21 05:24:32 1.55 @@ -6,20 +6,16 @@ /home/wakaba/work/manakai2/lib]; use CGI::Carp qw[fatalsToBrowser]; use Scalar::Util qw[refaddr]; -use Time::HiRes qw/time/; -sub htescape ($) { - my $s = $_[0]; - $s =~ s/&/&/g; - $s =~ s//>/g; - $s =~ s/"/"/g; - $s =~ s{([\x00-\x09\x0B-\x1F\x7F-\xA0\x{FEFF}\x{FFFC}-\x{FFFF}])}{ - sprintf 'U+%04X', ord $1; - }ge; - return $s; -} # htescape + require WebHACC::Input; + require WebHACC::Result; + require WebHACC::Output; +my $out; + + require Message::DOM::DOMImplementation; + my $dom = Message::DOM::DOMImplementation->new; +{ use Message::CGI::HTTP; my $http = Message::CGI::HTTP->new; @@ -27,17 +23,14 @@ 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 + $out = WebHACC::Output->new; + $out->handle (*STDOUT); + $out->set_utf8; + $out->set_flush; + $out->html (qq[Content-Type: text/html; charset=utf-8 @@ -48,516 +41,126 @@

Web Document Conformance Checker (beta)

-]; +]); - $| = 0; my $input = get_input_document ($http, $dom); - my $inner_html_element = $http->get_parameter ('e'); - my $char_length = 0; - my %time; - print qq[ -
-
-
Request URI
-
<@{[htescape $input->{request_uri}]}>
-
Document URI
-
<@{[htescape $input->{uri}]}>
-]; # no
yet - push @nav, ['#document-info' => 'Information']; + $out->input ($input); + $out->unset_flush; -if (defined $input->{s}) { - $char_length = length $input->{s}; + my $result = WebHACC::Result->new; + $result->output ($out); + $result->{conforming_min} = 1; + $result->{conforming_max} = 1; - 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)' : '']}
-
Length
-
$char_length byte@{[$char_length == 1 ? '' : 's']}
- -
-]; - - my $result = {conforming_min => 1, conforming_max => 1}; - print_http_header_section ($input, $result); + $out->html (''); - 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}); - } 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); - } + check_and_print ($input => $result => $out); + + $result->generate_result_section; - if (defined $doc or defined $el) { - print_structure_dump_dom_section ($doc, $el); - my $elements = print_structure_error_dom_section ($doc, $el, $result); - print_table_section ($elements->{table}) if @{$elements->{table}}; - print_id_section ($elements->{id}) if keys %{$elements->{id}}; - print_term_section ($elements->{term}) if keys %{$elements->{term}}; - print_class_section ($elements->{class}) if keys %{$elements->{class}}; - } elsif (defined $manifest) { - print_structure_dump_manifest_section ($manifest); - print_structure_error_manifest_section ($manifest, $result); - } + $out->nav_list; - print_result_section ($result); -} else { - print STDOUT qq[]; - print_result_input_error_section ($input); + exit; } - print STDOUT qq[ - - - -]; +sub check_and_print ($$$) { + my ($input, $result, $out) = @_; + my $original_input = $out->input; + $out->input ($input); - for (qw/decode parse 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"; - } + $input->generate_info_section ($result); -exit; + $input->generate_transfer_sections ($result); -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 '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; + unless (defined $input->{s}) { $result->{conforming_min} = 0; - $result->{conforming_max} = 0; - } -} # add_error - -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']; - 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.

- - -]; - - 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; - - $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now. - - my $time1 = time; - my $t = Encode::decode ($input->{charset}, $input->{s}); - $time{decode} = time - $time1; - - 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]; - } else { - $opt{line} = $opt{line} - 1 || 1; - print STDOUT qq[
Line $opt{line}
\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); - }; - - my $doc = $dom->create_document; - my $el; - $time1 = time; - 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, $t, $onerror); - } else { - Whatpm::HTML->parse_string ($t => $doc, $onerror); - } - $time{parse} = time - $time1; - - 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[ -
-

Parse Errors

- -
]; - push @nav, ['#parse-errors' => 'Parse Error']; - - my $onerror = sub { - my $err = shift; - my $line = $err->location->line_number; - print STDOUT qq[
Line $line column ]; - print STDOUT $err->location->column_number, "
"; - print STDOUT htescape $err->text, "
\n"; - - add_error ('syntax', {type => $err->text, - level => [ - $err->SEVERITY_FATAL_ERROR => 'm', - $err->SEVERITY_ERROR => 'm', - $err->SEVERITY_WARNING => 's', - ]->[$err->severity]} => $result); - - return 1; - }; - - 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; - - print STDOUT qq[
]; - - return ($doc, undef); -} # print_syntax_error_xml_section - -sub print_syntax_error_manifest_section ($$) { - my ($input, $result) = @_; - - require Whatpm::CacheManifest; - - 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}); - print STDOUT qq[
], get_error_label (\%opt), qq[
]; - $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); - }; - - 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']; - 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++; - } - if ($$s =~ /\G([^\x0A]+)/gc) { - print STDOUT qq[
  2. ], htescape $1, "
    3. \n"; - } - } else { - print STDOUT q[
  3. ]; - } - print STDOUT "
"; -} # print_input_string_section - -sub print_document_tree ($) { - my $node = shift; - my $r = '
    '; - - my @node = ($node); - while (@node) { - my $child = shift @node; - unless (ref $child) { - $r .= $child; - next; - } - - my $node_id = 'node-'.refaddr $child; - my $nt = $child->node_type; - if ($nt == $child->ELEMENT_NODE) { - my $child_nsuri = $child->namespace_uri; - $r .= qq[
  1. ] . htescape ($child->tag_name) . - ''; ## ISSUE: case - - if ($child->has_attributes) { - $r .= ''; - } - - if ($child->has_child_nodes) { - $r .= '
      '; - unshift @node, @{$child->child_nodes}, '
    2. '; - } else { - $r .= ''; - } - } elsif ($nt == $child->TEXT_NODE) { - $r .= qq'
  2. ' . htescape ($child->data) . '
    3. '; - } elsif ($nt == $child->CDATA_SECTION_NODE) { - $r .= qq'
  3. <[CDATA[' . htescape ($child->data) . ']]>
    4. '; - } elsif ($nt == $child->COMMENT_NODE) { - $r .= qq'
  4. <!--' . htescape ($child->data) . '-->
    5. '; - } elsif ($nt == $child->DOCUMENT_NODE) { - $r .= qq'
  5. Document'; - $r .= qq[]; - if ($child->has_child_nodes) { - $r .= '
      '; - unshift @node, @{$child->child_nodes}, '
    6. '; - } - } elsif ($nt == $child->DOCUMENT_TYPE_NODE) { - $r .= qq'
  6. <!DOCTYPE>
    7. '; - } elsif ($nt == $child->PROCESSING_INSTRUCTION_NODE) { - $r .= qq'
  7. <?@{[htescape ($child->target)]} @{[htescape ($child->data)]}?>
    8. '; - } else { - $r .= qq'
  8. @{[$child->node_type]} @{[htescape ($child->node_name)]}
    9. '; # error - } + return; } - $r .= '
'; - print STDOUT $r; -} # print_document_tree - -sub print_structure_dump_dom_section ($$) { - my ($doc, $el) = @_; - - print STDOUT qq[ -
-

Document Tree

-]; - push @nav, ['#document-tree' => 'Tree']; - - print_document_tree ($el || $doc); - - print STDOUT qq[
]; -} # print_structure_dump_dom_section - -sub print_structure_dump_manifest_section ($) { - my $manifest = shift; + my $checker_class = { + 'text/cache-manifest' => 'WebHACC::Language::CacheManifest', + 'text/css' => 'WebHACC::Language::CSS', + 'text/html' => 'WebHACC::Language::HTML', + 'text/x-webidl' => 'WebHACC::Language::WebIDL', + + 'text/xml' => 'WebHACC::Language::XML', + 'application/atom+xml' => 'WebHACC::Language::XML', + 'application/rss+xml' => 'WebHACC::Language::XML', + 'image/svg+xml' => 'WebHACC::Language::XML', + 'application/xhtml+xml' => 'WebHACC::Language::XML', + 'application/xml' => 'WebHACC::Language::XML', + ## TODO: Should we make all XML MIME Types fall + ## into this category? + + ## NOTE: This type has different model from normal XML types. + 'application/rdf+xml' => 'WebHACC::Language::XML', + }->{$input->{media_type}} || 'WebHACC::Language::Default'; + + eval qq{ require $checker_class } or die "$0: Loading $checker_class: $@"; + my $checker = $checker_class->new; + $checker->input ($input); + $checker->output ($out); + $checker->result ($result); + + ## TODO: A cache manifest MUST be text/cache-manifest + ## TODO: WebIDL media type "text/x-webidl" + + $checker->generate_syntax_error_section; + $checker->generate_source_string_section; + + my @subdoc; + $checker->onsubdoc (sub { + push @subdoc, shift; + }); - print STDOUT qq[ -
-

Cache Manifest

-]; - push @nav, ['#dump-manifest' => 'Caceh Manifest']; + $checker->generate_structure_dump_section; + $checker->generate_structure_error_section; + $checker->generate_additional_sections; - print STDOUT qq[
Explicit entries
]; - for my $uri (@{$manifest->[0]}) { - my $euri = htescape ($uri); - print STDOUT qq[
<$euri>
]; - } +=pod - print STDOUT qq[
Fallback entries
- - ]; - for my $uri (sort {$a cmp $b} keys %{$manifest->[1]}) { - my $euri = htescape ($uri); - my $euri2 = htescape ($manifest->[1]->{$uri}); - print STDOUT qq[ - ]; - } + if (defined $doc or defined $el) { - print STDOUT qq[
Oppotunistic Caching NamespaceFallback Entry
<$euri><$euri2>
Online whitelist
]; - for my $uri (@{$manifest->[2]}) { - my $euri = htescape ($uri); - print STDOUT qq[
<$euri>
]; + 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}}; + + print_rdf_section ($input, $elements->{rdf}) if @{$elements->{rdf}}; } - print STDOUT qq[
]; -} # print_structure_dump_manifest_section - -sub print_structure_error_dom_section ($$$) { - my ($doc, $el, $result) = @_; - - print STDOUT qq[
-

Document Errors

+=cut -
]; - push @nav, ['#document-errors' => 'Document Error']; + my $id_prefix = 0; + for my $_subinput (@subdoc) { + my $subinput = WebHACC::Input::Subdocument->new (++$id_prefix); + $subinput->{$_} = $_subinput->{$_} for keys %$_subinput; + $subinput->{base_uri} = $subinput->{container_node}->base_uri + unless defined $subinput->{base_uri}; + $subinput->{parent_input} = $input; - require Whatpm::ContentChecker; - my $onerror = sub { - my %opt = @_; - my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}, $opt{node}); - $type =~ tr/ /-/; - $type =~ s/\|/%7C/g; - $msg .= qq[ [Description]]; - print STDOUT qq[
] . get_error_label (\%opt) . - qq[
\n
], get_error_level_label (\%opt); - print STDOUT $msg, "
\n"; - add_error ('structure', \%opt => $result); - }; - - my $elements; - my $time1 = time; - if ($el) { - $elements = Whatpm::ContentChecker->check_element ($el, $onerror); - } else { - $elements = Whatpm::ContentChecker->check_document ($doc, $onerror); + $subinput->start_section ($result); + check_and_print ($subinput => $result => $out); + $subinput->end_section ($result); } - $time{check} = time - $time1; - - print STDOUT qq[
]; - - return $elements; -} # print_structure_error_dom_section - -sub print_structure_error_manifest_section ($$$) { - my ($manifest, $result) = @_; - print STDOUT qq[
-

Document Errors

+ $out->input ($original_input); +} # check_and_print -
]; - push @nav, ['#document-errors' => 'Document Error']; - - require Whatpm::CacheManifest; - Whatpm::CacheManifest->check_manifest ($manifest, sub { - my %opt = @_; - my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}, $opt{node}); - $type =~ tr/ /-/; - $type =~ s/\|/%7C/g; - $msg .= qq[ [Description]]; - print STDOUT qq[
] . get_error_label (\%opt) . - qq[
\n
], $msg, "
\n"; - add_error ('structure', \%opt => $result); - }); - - print STDOUT qq[
]; -} # print_structure_error_manifest_section - -sub print_table_section ($) { - my $tables = shift; +sub print_table_section ($$) { + my ($input, $tables) = @_; - push @nav, ['#tables' => 'Tables']; +# push @nav, [qq[#$input->{id_prefix}tables] => 'Tables'] +# unless $input->{nested}; print STDOUT qq[ -
+

Tables

@@ -570,16 +173,15 @@ require JSON; my $i = 0; - for my $table_el (@$tables) { + for my $table (@$tables) { $i++; - print STDOUT qq[

] . - get_node_link ($table_el) . q[

]; + print STDOUT qq[

] . + get_node_link ($input, $table->{element}) . 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}) { + delete $table->{element}; + + for (@{$table->{column_group}}, @{$table->{column}}, $table->{caption}, + @{$table->{row}}) { next unless $_; delete $_->{element}; } @@ -605,275 +207,97 @@ print STDOUT '
]; + print STDOUT qq[, document.getElementById ('$input->{id_prefix}table-$i')]; + print STDOUT qq[, '$input->{id_prefix}');]; } print STDOUT qq[
]; } # print_table_section -sub print_id_section ($) { - my $ids = shift; +sub print_listing_section ($$$) { + my ($opt, $input, $ids) = @_; - push @nav, ['#identifiers' => 'IDs']; +# push @nav, ['#' . $input->{id_prefix} . $opt->{id} => $opt->{label}] +# unless $input->{nested}; print STDOUT qq[ -
-

Identifiers

+
+

$opt->{heading}

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

Terms

+} # print_listing_section -
-]; - for my $term (sort {$a cmp $b} keys %$terms) { - print STDOUT qq[
@{[htescape $term]}
]; - for (@{$terms->{$term}}) { - print STDOUT qq[
].get_node_link ($_).qq[
]; - } - } - print STDOUT qq[
]; -} # print_term_section -sub print_class_section ($) { - my $classes = shift; +sub print_rdf_section ($$$) { + my ($input, $rdfs) = @_; - push @nav, ['#classes' => 'Classes']; +# push @nav, ['#' . $input->{id_prefix} . 'rdf' => 'RDF'] +# unless $input->{nested}; print STDOUT qq[ -
-

Classes

+
+

RDF Triples

-
-]; - for my $class (sort {$a cmp $b} keys %$classes) { - print STDOUT qq[
@{[htescape $class]}
]; - for (@{$classes->{$class}}) { - print STDOUT qq[
].get_node_link ($_).qq[
]; +
]; + my $i = 0; + for my $rdf (@$rdfs) { + print STDOUT qq[
]; + print STDOUT get_node_link ($input, $rdf->[0]); + print STDOUT qq[
]; + for my $triple (@{$rdf->[1]}) { + print STDOUT '
' . get_node_link ($input, $triple->[0]) . '
'; + print STDOUT get_rdf_resource_html ($triple->[1]); + print STDOUT ' '; + print STDOUT get_rdf_resource_html ($triple->[2]); + print STDOUT ' '; + print STDOUT get_rdf_resource_html ($triple->[3]); } + print STDOUT qq[
]; } print STDOUT qq[
]; -} # print_class_section - -sub print_result_section ($) { - my $result = shift; - - print STDOUT qq[ -
-

Result

]; - - if ($result->{unsupported} and $result->{conforming_max}) { - print STDOUT qq[

The conformance - checker cannot decide whether the document is conforming or - not, since the document contains one or more unsupported - features. The document might or might not be conforming.

]; - } elsif ($result->{conforming_min}) { - print STDOUT qq[

No conformance-error is - found in this document.

]; - } elsif ($result->{conforming_max}) { - print STDOUT qq[

This document - is likely non-conforming, but in rare case - it might be conforming.

]; - } else { - print STDOUT qq[

This document is - non-conforming.

]; - } - - print STDOUT qq[ -- - - - - -]; - - my $must_error = 0; - my $should_error = 0; - my $warning = 0; - my $score_min = 0; - my $score_max = 0; - my $score_base = 20; - my $score_unit = $score_base / 100; - for ( - [Transfer => 'transfer', ''], - [Character => 'char', ''], - [Syntax => 'syntax', '#parse-errors'], - [Structure => 'structure', '#document-errors'], - ) { - $must_error += ($result->{$_->[1]}->{must} += 0); - $should_error += ($result->{$_->[1]}->{should} += 0); - $warning += ($result->{$_->[1]}->{warning} += 0); - $score_min += (($result->{$_->[1]}->{score_min} *= $score_unit) += $score_base); - $score_max += (($result->{$_->[1]}->{score_max} *= $score_unit) += $score_base); - - my $uncertain = $result->{$_->[1]}->{unsupported} ? '?' : ''; - my $label = $_->[0]; - if ($result->{$_->[1]}->{must} or - $result->{$_->[1]}->{should} or - $result->{$_->[1]}->{warning} or - $result->{$_->[1]}->{unsupported}) { - $label = qq[$label]; - } - - print STDOUT qq[]; - if ($uncertain) { - print qq[]; - } elsif ($result->{$_->[1]}->{score_min} != $result->{$_->[1]}->{score_max}) { - print qq[]; - } else { - print qq[]; - } - } - - $score_max += $score_base; - - print STDOUT qq[ - - - - - - - -
MUST‐level -ErrorsSHOULD‐level -ErrorsWarningsScore
$label$result->{$_->[1]}->{must}$uncertain$result->{$_->[1]}->{should}$uncertain$result->{$_->[1]}->{warning}$uncertain−∞..$result->{$_->[1]}->{score_max}$result->{$_->[1]}->{score_min}..$result->{$_->[1]}->{score_max}
$result->{$_->[1]}->{score_min}
Semantics0?0?0?−∞..$score_base
Total$must_error?$should_error?$warning?−∞..$score_max
- -

Important: This conformance checking service -is under development. The result above might be wrong.

-
]; - push @nav, ['#result-summary' => 'Result']; -} # print_result_section - -sub print_result_unknown_type_section ($) { - my $input = shift; +} # print_rdf_section - print STDOUT qq[ -
-

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

-
-]; - push @nav, ['#result-summary' => 'Result']; -} # print_result_unknown_type_section - -sub print_result_input_error_section ($) { - my $input = shift; - print STDOUT qq[
-

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

-
]; - push @nav, ['#result-summary' => 'Result']; -} # print_Result_input_error_section - -sub get_error_label ($) { - my $err = shift; - - my $r = ''; - - if (defined $err->{line}) { - if ($err->{column} > 0) { - $r = qq[Line $err->{line} column $err->{column}]; - } else { - $err->{line} = $err->{line} - 1 || 1; - $r = qq[Line $err->{line}]; +sub get_rdf_resource_html ($) { + my $resource = shift; + if (defined $resource->{uri}) { + my $euri = htescape ($resource->{uri}); + return '<' . $euri . + '>'; + } elsif (defined $resource->{bnodeid}) { + return htescape ('_:' . $resource->{bnodeid}); + } elsif ($resource->{nodes}) { + return '(rdf:XMLLiteral)'; + } elsif (defined $resource->{value}) { + my $elang = htescape (defined $resource->{language} + ? $resource->{language} : ''); + my $r = qq[] . htescape ($resource->{value}) . ''; + if (defined $resource->{datatype}) { + my $euri = htescape ($resource->{datatype}); + $r .= '^^<' . $euri . + '>'; + } elsif (length $resource->{language}) { + $r .= '@' . htescape ($resource->{language}); } - } - - if (defined $err->{node}) { - $r .= ' ' if length $r; - $r = get_node_link ($err->{node}); - } - - if (defined $err->{index}) { - $r .= ' ' if length $r; - $r .= 'Index ' . (0+$err->{index}); - } - - if (defined $err->{value}) { - $r .= ' ' if length $r; - $r .= '' . htescape ($err->{value}) . ''; - } - - return $r; -} # get_error_label - -sub get_error_level_label ($) { - my $err = shift; - - my $r = ''; - - if (not defined $err->{level} or $err->{level} eq 'm') { - $r = qq[MUST‐level - error: ]; - } elsif ($err->{level} eq 's') { - $r = qq[SHOULD‐level - error: ]; - } elsif ($err->{level} eq 'w') { - $r = qq[Warning: - ]; - } elsif ($err->{level} eq 'unsupported') { - $r = qq[Not - supported: ]; + return $r; } else { - my $elevel = htescape ($err->{level}); - $r = qq[$elevel: - ]; - } - - return $r; -} # get_error_level_label - -sub get_node_path ($) { - my $node = shift; - my @r; - while (defined $node) { - my $rs; - if ($node->node_type == 1) { - $rs = $node->manakai_local_name; - $node = $node->parent_node; - } elsif ($node->node_type == 2) { - $rs = '@' . $node->manakai_local_name; - $node = $node->owner_element; - } elsif ($node->node_type == 3) { - $rs = '"' . $node->data . '"'; - $node = $node->parent_node; - } elsif ($node->node_type == 9) { - @r = ('') unless @r; - $rs = ''; - $node = $node->parent_node; - } else { - $rs = '#' . $node->node_type; - $node = $node->parent_node; - } - unshift @r, $rs; + return '??'; } - return join '/', @r; -} # get_node_path - -sub get_node_link ($) { - return qq[] . - htescape (get_node_path ($_[0])) . qq[]; -} # get_node_link +} # get_rdf_resource_html { my $Msg = {}; sub load_text_catalog ($) { +# my $self = shift; my $lang = shift; # MUST be a canonical lang name - open my $file, '<', "cc-msg.$lang.txt" or die "$0: cc-msg.$lang.txt: $!"; + open my $file, '<:utf8', "cc-msg.$lang.txt" + or die "$0: cc-msg.$lang.txt: $!"; while (<$file>) { if (s/^([^;]+);([^;]*);//) { my ($type, $cls, $msg) = ($1, $2, $_); @@ -883,40 +307,43 @@ } } # load_text_catalog -sub get_text ($) { +sub get_text ($;$$) { +# my $self = shift; my ($type, $level, $node) = @_; $type = $level . ':' . $type if defined $level; + $level = 'm' unless defined $level; my @arg; { if (defined $Msg->{$type}) { my $msg = $Msg->{$type}->[1]; $msg =~ s{\$([0-9]+)}{ - defined $arg[$1] ? htescape ($arg[$1]) : '(undef)'; - }ge; + defined $arg[$1] ? ($arg[$1]) : '(undef)'; + }ge; ##BUG: ^ must be escaped $msg =~ s{{\@([A-Za-z0-9:_.-]+)}}{ UNIVERSAL::can ($node, 'get_attribute_ns') - ? htescape ($node->get_attribute_ns (undef, $1)) : '' - }ge; - $msg =~ s{{\@}}{ - UNIVERSAL::can ($node, 'value') ? htescape ($node->value) : '' + ? ($node->get_attribute_ns (undef, $1)) : '' + }ge; ## BUG: ^ must be escaped + $msg =~ s{{\@}}{ ## BUG: v must be escaped + UNIVERSAL::can ($node, 'value') ? ($node->value) : '' }ge; $msg =~ s{{local-name}}{ UNIVERSAL::can ($node, 'manakai_local_name') - ? htescape ($node->manakai_local_name) : '' - }ge; + ? ($node->manakai_local_name) : '' + }ge; ## BUG: ^ must be escaped $msg =~ s{{element-local-name}}{ (UNIVERSAL::can ($node, 'owner_element') and $node->owner_element) - ? htescape ($node->owner_element->manakai_local_name) - : '' + ? ($node->owner_element->manakai_local_name) + : '' ## BUG: ^ must be escaped }ge; - return ($type, $Msg->{$type}->[0], $msg); + return ($type, 'level-' . $level . ' ' . $Msg->{$type}->[0], $msg); } elsif ($type =~ s/:([^:]*)$//) { unshift @arg, $1; redo; } } - return ($type, '', htescape ($_[0])); + return ($type, 'level-'.$level, ($_[0])); + ## BUG: ^ must be escaped } # get_text } @@ -924,15 +351,18 @@ sub get_input_document ($$) { my ($http, $dom) = @_; - my $request_uri = $http->get_parameter ('uri'); - my $r = {}; + require Encode; + my $request_uri = Encode::decode ('utf-8', $http->get_parameter ('uri')); + my $r = WebHACC::Input->new; if (defined $request_uri and length $request_uri) { my $uri = $dom->create_uri_reference ($request_uri); unless ({ http => 1, }->{lc $uri->uri_scheme}) { - return {uri => $request_uri, request_uri => $request_uri, - error_status_text => 'URI scheme not allowed'}; + $r = WebHACC::Input::Error->new; + $r->{uri} = $request_uri; + $r->{request_uri} = $request_uri; + $r->{error_status_text} = 'URL scheme not allowed'; } require Message::Util::HostPermit; @@ -959,8 +389,11 @@ Allow host=* EOH unless ($host_permit->check ($uri->uri_host, $uri->uri_port || 80)) { - return {uri => $request_uri, request_uri => $request_uri, - error_status_text => 'Connection to the host is forbidden'}; + my $r = WebHACC::Input::Error->new; + $r->{uri} = $request_uri; + $r->{request_uri} = $request_uri; + $r->{error_status_text} = 'Connection to the host is forbidden'; + return $r; } require LWP::UserAgent; @@ -972,6 +405,7 @@ $ua->protocols_allowed ([qw/http/]); $ua->max_size (1000_000); my $req = HTTP::Request->new (GET => $request_uri); + $req->header ('Accept-Encoding' => 'identity, *; q=0'); my $res = $ua->request ($req); ## TODO: 401 sets |is_success| true. if ($res->is_success or $http->get_parameter ('error-page')) { @@ -981,12 +415,10 @@ ## TODO: More strict parsing... my $ct = $res->header ('Content-Type'); - if (defined $ct and $ct =~ m#^([0-9A-Za-z._+-]+/[0-9A-Za-z._+-]+)#) { - $r->{media_type} = lc $1; - } if (defined $ct and $ct =~ /;\s*charset\s*=\s*"?([^\s;"]+)"?/i) { $r->{charset} = lc $1; $r->{charset} =~ tr/\\//d; + $r->{official_charset} = $r->{charset}; } my $input_charset = $http->get_parameter ('charset'); @@ -994,9 +426,22 @@ $r->{charset_overridden} = (not defined $r->{charset} or $r->{charset} ne $input_charset); $r->{charset} = $input_charset; - } + } + + ## TODO: Support for HTTP Content-Encoding $r->{s} = ''.$res->content; + + require Whatpm::ContentType; + ($r->{official_type}, $r->{media_type}) + = Whatpm::ContentType->get_sniffed_type + (get_file_head => sub { + return substr $r->{s}, 0, shift; + }, + http_content_type_byte => $ct, + has_http_content_encoding => + defined $res->header ('Content-Encoding'), + supported_image_types => {}); } else { $r->{uri} = $res->request->uri; $r->{request_uri} = $request_uri; @@ -1017,7 +462,18 @@ $r->{charset} = ''.$http->get_parameter ('_charset_'); $r->{charset} =~ s/\s+//g; $r->{charset} = 'utf-8' if $r->{charset} eq ''; + $r->{official_charset} = $r->{charset}; $r->{header_field} = []; + + require Whatpm::ContentType; + ($r->{official_type}, $r->{media_type}) + = Whatpm::ContentType->get_sniffed_type + (get_file_head => sub { + return substr $r->{s}, 0, shift; + }, + http_content_type_byte => undef, + has_http_content_encoding => 0, + supported_image_types => {}); } my $input_format = $http->get_parameter ('i'); @@ -1034,6 +490,7 @@ if ($r->{media_type} eq 'text/xml') { unless (defined $r->{charset}) { $r->{charset} = 'us-ascii'; + $r->{official_charset} = $r->{charset}; } elsif ($r->{charset_overridden} and $r->{charset} eq 'us-ascii') { $r->{charset_overridden} = 0; } @@ -1045,6 +502,8 @@ return $r; } + $r->{inner_html_element} = $http->get_parameter ('e'); + return $r; } # get_input_document @@ -1077,11 +536,11 @@ =head1 LICENSE -Copyright 2007 Wakaba +Copyright 2007-2008 Wakaba This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. =cut -## $Date: 2007/11/05 09:33:52 $ +## $Date: 2008/07/21 05:24:32 $