--- test/html-webhacc/cc.cgi 2007/11/11 06:57:16 1.24 +++ test/html-webhacc/cc.cgi 2008/03/16 11:38:47 1.41 @@ -20,6 +20,11 @@ return $s; } # htescape + my @nav; + my %time; + require Message::DOM::DOMImplementation; + my $dom = Message::DOM::DOMImplementation->new; +{ use Message::CGI::HTTP; my $http = Message::CGI::HTTP->new; @@ -31,12 +36,8 @@ 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 @@ -52,9 +53,7 @@ $| = 0; my $input = get_input_document ($http, $dom); - my $inner_html_element = $http->get_parameter ('e'); my $char_length = 0; - my %time; print qq[
@@ -62,7 +61,12 @@
Request URI
<@{[htescape $input->{request_uri}]}>
Document URI
-
<@{[htescape $input->{uri}]}>
+
<@{[htescape $input->{uri}]}> +
]; # no yet push @nav, ['#document-info' => 'Information']; @@ -74,7 +78,7 @@
<@{[htescape $input->{base_uri}]}>
Internet Media Type
@{[htescape $input->{media_type}]} - @{[$input->{media_type_overridden} ? '(overridden)' : '']}
+ @{[$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
@{[defined $input->{charset} ? ''.htescape ($input->{charset}).'' : '(none)']} @{[$input->{charset_overridden} ? '(overridden)' : '']}
@@ -82,49 +86,14 @@
$char_length byte@{[$char_length == 1 ? '' : 's']}
+ + ]; + $input->{id_prefix} = ''; + #$input->{nested} = 0; my $result = {conforming_min => 1, conforming_max => 1}; - 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}); - } 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 ($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); - } - + check_and_print ($input => $result); print_result_section ($result); } else { print STDOUT qq[]; @@ -151,6 +120,7 @@ } exit; +} sub add_error ($$$) { my ($layer, $err, $result) = @_; @@ -161,9 +131,11 @@ $result->{conforming_min} = 0; } elsif ($err->{level} eq 'w' or $err->{level} eq 'g') { $result->{$layer}->{warning}++; - } elsif ($err->{level} eq 'unsupported') { + } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') { $result->{$layer}->{unsupported}++; $result->{unsupported} = 1; + } elsif ($err->{level} eq 'i') { + # } else { $result->{$layer}->{must}++; $result->{$layer}->{score_max} -= 2; @@ -180,14 +152,112 @@ } } # add_error +sub check_and_print ($$) { + my ($input, $result) = @_; + + print_http_header_section ($input, $result); + + my $doc; + my $el; + my $cssom; + my $manifest; + my @subdoc; + + if ($input->{media_type} eq 'text/html') { + ($doc, $el) = print_syntax_error_html_section ($input, $result); + print_source_string_section + ($input, + \($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, + \($input->{s}), + $doc->input_encoding); + } elsif ($input->{media_type} eq 'text/css') { + $cssom = print_syntax_error_css_section ($input, $result); + print_source_string_section + ($input, \($input->{s}), + $cssom->manakai_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, \($input->{s}), + 'utf-8'); + } else { + ## TODO: Change HTTP status code?? + print_result_unknown_type_section ($input, $result); + } + + if (defined $doc or defined $el) { + $doc->document_uri ($input->{uri}); + $doc->manakai_entity_base_uri ($input->{base_uri}); + print_structure_dump_dom_section ($input, $doc, $el); + my $elements = print_structure_error_dom_section + ($input, $doc, $el, $result, sub { + push @subdoc, shift; + }); + 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 $cssom) { + print_structure_dump_cssom_section ($input, $cssom); + ## TODO: CSSOM validation + add_error ('structure', {level => 'u'} => $result); + } elsif (defined $manifest) { + print_structure_dump_manifest_section ($input, $manifest); + print_structure_error_manifest_section ($input, $manifest, $result); + } + + my $id_prefix = 0; + for my $subinput (@subdoc) { + $subinput->{id_prefix} = 'subdoc-' . ++$id_prefix; + $subinput->{nested} = 1; + $subinput->{base_uri} = $subinput->{container_node}->base_uri + unless defined $subinput->{base_uri}; + my $ebaseuri = htescape ($subinput->{base_uri}); + push @nav, ['#' . $subinput->{id_prefix} => 'Sub #' . $id_prefix]; + print STDOUT qq[
+

Subdocument #$id_prefix

+ +
+
Internet Media Type
+
@{[htescape $subinput->{media_type}]} +
Container Node
+
@{[get_node_link ($input, $subinput->{container_node})]}
+
Base URI
+
<$ebaseuri>
+
]; + + $subinput->{id_prefix} .= '-'; + check_and_print ($subinput => $result); + + print STDOUT qq[
]; + } +} # 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}}; + @{$input->{header_field} or []}; - push @nav, ['#source-header' => 'HTTP Header']; - print STDOUT qq[
+ push @nav, ['#source-header' => 'HTTP Header'] unless $input->{nested}; + print STDOUT qq[

HTTP Header

Note: Due to the limitation of the @@ -221,21 +291,17 @@ require Whatpm::HTML; print STDOUT qq[ -

+

Parse Errors

-
]; - push @nav, ['#parse-errors' => 'Parse Error']; +
]; + 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]; - } else { - $opt{line} = $opt{line} - 1 || 1; - print STDOUT qq[
Line $opt{line}
\n]; - } + print STDOUT qq[
], get_error_label ($input, \%opt), + qq[
]; $type =~ tr/ /-/; $type =~ s/\|/%7C/g; $msg .= qq[ [Description]]; @@ -247,8 +313,9 @@ my $doc = $dom->create_document; my $el; + my $inner_html_element = $input->{inner_html_element}; if (defined $inner_html_element and length $inner_html_element) { - $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now. + $input->{charset} ||= 'windows-1252'; ## TODO: for now. my $time1 = time; my $t = Encode::decode ($input->{charset}, $input->{s}); $time{decode} = time - $time1; @@ -264,6 +331,8 @@ ($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[
]; @@ -276,16 +345,16 @@ require Message::DOM::XMLParserTemp; 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; my $line = $err->location->line_number; - print STDOUT qq[
Line $line column ]; + print STDOUT qq[
Line $line column ]; print STDOUT $err->location->column_number, "
"; print STDOUT htescape $err->text, "
\n"; @@ -304,28 +373,266 @@ 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 +sub get_css_parser () { + our $CSSParser; + return $CSSParser if $CSSParser; + + require Whatpm::CSS::Parser; + my $p = Whatpm::CSS::Parser->new; + + $p->{prop}->{$_} = 1 for qw/ + alignment-baseline + background background-attachment background-color background-image + background-position background-position-x background-position-y + background-repeat border border-bottom border-bottom-color + border-bottom-style border-bottom-width border-collapse border-color + border-left border-left-color + border-left-style border-left-width border-right border-right-color + border-right-style border-right-width + border-spacing -manakai-border-spacing-x -manakai-border-spacing-y + border-style border-top border-top-color border-top-style border-top-width + border-width bottom + caption-side clear clip color content counter-increment counter-reset + cursor direction display dominant-baseline empty-cells float font + font-family font-size font-size-adjust font-stretch + font-style font-variant font-weight height left + letter-spacing line-height + list-style list-style-image list-style-position list-style-type + margin margin-bottom margin-left margin-right margin-top marker-offset + marks max-height max-width min-height min-width opacity -moz-opacity + orphans outline outline-color outline-style outline-width overflow + overflow-x overflow-y + padding padding-bottom padding-left padding-right padding-top + page page-break-after page-break-before page-break-inside + position quotes right size table-layout + text-align text-anchor text-decoration text-indent text-transform + top unicode-bidi vertical-align visibility white-space width widows + word-spacing writing-mode z-index + /; + $p->{prop_value}->{display}->{$_} = 1 for qw/ + block clip inline inline-block inline-table list-item none + table table-caption table-cell table-column table-column-group + table-header-group table-footer-group table-row table-row-group + compact marker + /; + $p->{prop_value}->{position}->{$_} = 1 for qw/ + absolute fixed relative static + /; + $p->{prop_value}->{float}->{$_} = 1 for qw/ + left right none + /; + $p->{prop_value}->{clear}->{$_} = 1 for qw/ + left right none both + /; + $p->{prop_value}->{direction}->{ltr} = 1; + $p->{prop_value}->{direction}->{rtl} = 1; + $p->{prop_value}->{marks}->{crop} = 1; + $p->{prop_value}->{marks}->{cross} = 1; + $p->{prop_value}->{'unicode-bidi'}->{$_} = 1 for qw/ + normal bidi-override embed + /; + for my $prop_name (qw/overflow overflow-x overflow-y/) { + $p->{prop_value}->{$prop_name}->{$_} = 1 for qw/ + visible hidden scroll auto -webkit-marquee -moz-hidden-unscrollable + /; + } + $p->{prop_value}->{visibility}->{$_} = 1 for qw/ + visible hidden collapse + /; + $p->{prop_value}->{'list-style-type'}->{$_} = 1 for qw/ + disc circle square decimal decimal-leading-zero + lower-roman upper-roman lower-greek lower-latin + upper-latin armenian georgian lower-alpha upper-alpha none + hebrew cjk-ideographic hiragana katakana hiragana-iroha + katakana-iroha + /; + $p->{prop_value}->{'list-style-position'}->{outside} = 1; + $p->{prop_value}->{'list-style-position'}->{inside} = 1; + $p->{prop_value}->{'page-break-before'}->{$_} = 1 for qw/ + auto always avoid left right + /; + $p->{prop_value}->{'page-break-after'}->{$_} = 1 for qw/ + auto always avoid left right + /; + $p->{prop_value}->{'page-break-inside'}->{auto} = 1; + $p->{prop_value}->{'page-break-inside'}->{avoid} = 1; + $p->{prop_value}->{'background-repeat'}->{$_} = 1 for qw/ + repeat repeat-x repeat-y no-repeat + /; + $p->{prop_value}->{'background-attachment'}->{scroll} = 1; + $p->{prop_value}->{'background-attachment'}->{fixed} = 1; + $p->{prop_value}->{'font-size'}->{$_} = 1 for qw/ + xx-small x-small small medium large x-large xx-large + -manakai-xxx-large -webkit-xxx-large + larger smaller + /; + $p->{prop_value}->{'font-style'}->{normal} = 1; + $p->{prop_value}->{'font-style'}->{italic} = 1; + $p->{prop_value}->{'font-style'}->{oblique} = 1; + $p->{prop_value}->{'font-variant'}->{normal} = 1; + $p->{prop_value}->{'font-variant'}->{'small-caps'} = 1; + $p->{prop_value}->{'font-stretch'}->{$_} = 1 for + qw/normal wider narrower ultra-condensed extra-condensed + condensed semi-condensed semi-expanded expanded + extra-expanded ultra-expanded/; + $p->{prop_value}->{'text-align'}->{$_} = 1 for qw/ + left right center justify begin end + /; + $p->{prop_value}->{'text-transform'}->{$_} = 1 for qw/ + capitalize uppercase lowercase none + /; + $p->{prop_value}->{'white-space'}->{$_} = 1 for qw/ + normal pre nowrap pre-line pre-wrap -moz-pre-wrap + /; + $p->{prop_value}->{'writing-mode'}->{$_} = 1 for qw/ + lr rl tb lr-tb rl-tb tb-rl + /; + $p->{prop_value}->{'text-anchor'}->{$_} = 1 for qw/ + start middle end + /; + $p->{prop_value}->{'dominant-baseline'}->{$_} = 1 for qw/ + auto use-script no-change reset-size ideographic alphabetic + hanging mathematical central middle text-after-edge text-before-edge + /; + $p->{prop_value}->{'alignment-baseline'}->{$_} = 1 for qw/ + auto baseline before-edge text-before-edge middle central + after-edge text-after-edge ideographic alphabetic hanging + mathematical + /; + $p->{prop_value}->{'text-decoration'}->{$_} = 1 for qw/ + none blink underline overline line-through + /; + $p->{prop_value}->{'caption-side'}->{$_} = 1 for qw/ + top bottom left right + /; + $p->{prop_value}->{'table-layout'}->{auto} = 1; + $p->{prop_value}->{'table-layout'}->{fixed} = 1; + $p->{prop_value}->{'border-collapse'}->{collapse} = 1; + $p->{prop_value}->{'border-collapse'}->{separate} = 1; + $p->{prop_value}->{'empty-cells'}->{show} = 1; + $p->{prop_value}->{'empty-cells'}->{hide} = 1; + $p->{prop_value}->{cursor}->{$_} = 1 for qw/ + auto crosshair default pointer move e-resize ne-resize nw-resize n-resize + se-resize sw-resize s-resize w-resize text wait help progress + /; + for my $prop (qw/border-top-style border-left-style + border-bottom-style border-right-style outline-style/) { + $p->{prop_value}->{$prop}->{$_} = 1 for qw/ + none hidden dotted dashed solid double groove ridge inset outset + /; + } + for my $prop (qw/color background-color + border-bottom-color border-left-color border-right-color + border-top-color border-color/) { + $p->{prop_value}->{$prop}->{transparent} = 1; + $p->{prop_value}->{$prop}->{flavor} = 1; + $p->{prop_value}->{$prop}->{'-manakai-default'} = 1; + } + $p->{prop_value}->{'outline-color'}->{invert} = 1; + $p->{prop_value}->{'outline-color'}->{'-manakai-invert-or-currentcolor'} = 1; + $p->{pseudo_class}->{$_} = 1 for qw/ + active checked disabled empty enabled first-child first-of-type + focus hover indeterminate last-child last-of-type link only-child + only-of-type root target visited + lang nth-child nth-last-child nth-of-type nth-last-of-type not + -manakai-contains -manakai-current + /; + $p->{pseudo_element}->{$_} = 1 for qw/ + after before first-letter first-line + /; + + return $CSSParser = $p; +} # get_css_parser + +sub print_syntax_error_css_section ($$) { + my ($input, $result) = @_; + + print STDOUT qq[ +
+

Parse Errors

+ +
]; + push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested}; + + my $p = get_css_parser (); + $p->init; + $p->{onerror} = sub { + my (%opt) = @_; + my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}); + if ($opt{token}) { + print STDOUT qq[
Line $opt{token}->{line} column $opt{token}->{column}]; + } else { + print STDOUT qq[
Unknown location]; + } + if (defined $opt{value}) { + print STDOUT qq[ (@{[htescape ($opt{value})]})]; + } elsif (defined $opt{token}) { + print STDOUT qq[ (@{[htescape (Whatpm::CSS::Tokenizer->serialize_token ($opt{token}))]})]; + } + $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); + }; + $p->{href} = $input->{uri}; + $p->{base_uri} = $input->{base_uri}; + +# if ($parse_mode eq 'q') { +# $p->{unitless_px} = 1; +# $p->{hashless_color} = 1; +# } + +## TODO: Make $input->{s} a ref. + + my $s = \$input->{s}; + my $charset; + unless ($input->{is_char_string}) { + require Encode; + if (defined $input->{charset}) {## TODO: IANA->Perl + $charset = $input->{charset}; + $s = \(Encode::decode ($input->{charset}, $$s)); + } else { + ## TODO: charset detection + $s = \(Encode::decode ($charset = 'utf-8', $$s)); + } + } + + my $cssom = $p->parse_char_string ($$s); + $cssom->manakai_input_encoding ($charset) if defined $charset; + + print STDOUT qq[
]; + + return $cssom; +} # print_syntax_error_css_section + sub print_syntax_error_manifest_section ($$) { my ($input, $result) = @_; require Whatpm::CacheManifest; print STDOUT qq[ -
+

Parse Errors

-
]; - push @nav, ['#parse-errors' => 'Parse Error']; +
]; + push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested}; my $onerror = sub { my (%opt) = @_; my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}); - print STDOUT qq[
], get_error_label (\%opt), qq[
]; + print STDOUT qq[
], get_error_label ($input, \%opt), + qq[
]; $type =~ tr/ /-/; $type =~ s/\|/%7C/g; $msg .= qq[ [Description]]; @@ -345,33 +652,44 @@ 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; +sub print_source_string_section ($$$) { + my $input = shift; + my $s; + unless ($input->{is_char_string}) { + require Encode; + my $enc = Encode::find_encoding ($_[1]); ## TODO: charset name -> Perl name + return unless $enc; + + $s = \($enc->decode (${$_[0]})); + } else { + $s = $_[0]; + } - my $s = \($enc->decode (${$_[0]})); my $i = 1; - push @nav, ['#source-string' => 'Source']; - print STDOUT qq[
+ 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"; + while ($$s =~ /\G([^\x0D\x0A]*?)(?>\x0D\x0A?|\x0A)/gc) { + print STDOUT qq[
  2. ], htescape $1, + "
    3. \n"; $i++; } - if ($$s =~ /\G([^\x0A]+)/gc) { - print STDOUT qq[
  3. ], htescape $1, "
    4. \n"; + if ($$s =~ /\G([^\x0D\x0A]+)/gc) { + print STDOUT qq[
  4. ], htescape $1, + "
    5. \n"; } } else { - print STDOUT q[
  5. ]; + print STDOUT q[
  6. ]; } - print STDOUT "
"; + print STDOUT "
+"; } # print_input_string_section -sub print_document_tree ($) { - my $node = shift; +sub print_document_tree ($$) { + my ($input, $node) = @_; + my $r = '
    '; my @node = ($node); @@ -382,7 +700,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; @@ -393,7 +711,7 @@ $r .= '
      '; for my $attr (sort {$a->[0] cmp $b->[0]} map { [$_->name, $_->value, $_->namespace_uri, 'node-'.refaddr $_] } @{$child->attributes}) { - $r .= qq[
    • ] . htescape ($attr->[0]) . ' = '; ## ISSUE: case? + $r .= qq[
    • ] . htescape ($attr->[0]) . ' = '; ## ISSUE: case? $r .= '' . htescape ($attr->[1]) . '
      • '; ## TODO: children } $r .= '
    '; @@ -414,6 +732,21 @@ } elsif ($nt == $child->DOCUMENT_NODE) { $r .= qq'
  1. Document'; $r .= qq[
      ]; + my $cp = $child->manakai_charset; + if (defined $cp) { + $r .= qq[
    • charset parameter = ]; + $r .= htescape ($cp) . qq[
      • ]; + } + $r .= qq[
    • inputEncoding = ]; + my $ie = $child->input_encoding; + if (defined $ie) { + $r .= qq[@{[htescape ($ie)]}]; + if ($child->manakai_has_bom) { + $r .= qq[ (with BOM)]; + } + } else { + $r .= qq[(null)]; + } $r .= qq[
    • @{[scalar get_text ('manakaiIsHTML:'.($child->manakai_is_html?1:0))]}
      • ]; $r .= qq[
    • @{[scalar get_text ('manakaiCompatMode:'.$child->manakai_compat_mode)]}
      • ]; unless ($child->manakai_is_html) { @@ -447,33 +780,52 @@ print STDOUT $r; } # print_document_tree -sub print_structure_dump_dom_section ($$) { - my ($doc, $el) = @_; +sub print_structure_dump_dom_section ($$$) { + my ($input, $doc, $el) = @_; print STDOUT qq[ -
      +

      Document Tree

      ]; - push @nav, ['#document-tree' => 'Tree']; + push @nav, [qq[#$input->{id_prefix}document-tree] => 'Tree'] + unless $input->{nested}; - print_document_tree ($el || $doc); + print_document_tree ($input, $el || $doc); print STDOUT qq[
      ]; } # print_structure_dump_dom_section -sub print_structure_dump_manifest_section ($) { - my $manifest = shift; +sub print_structure_dump_cssom_section ($$) { + my ($input, $cssom) = @_; + + print STDOUT qq[ +
      +

      Document Tree

      +]; + push @nav, [qq[#$input->{id_prefix}document-tree] => 'Tree'] + unless $input->{nested}; + + ## TODO: + print STDOUT "
      ".htescape ($cssom->css_text)."
      "; + + print STDOUT qq[
      ]; +} # print_structure_dump_cssom_section + +sub print_structure_dump_manifest_section ($$) { + my ($input, $manifest) = @_; print STDOUT qq[ -
      +

      Cache Manifest

      ]; - push @nav, ['#dump-manifest' => 'Caceh Manifest']; + push @nav, [qq[#$input->{id_prefix}dump-manifest] => 'Cache Manifest'] + unless $input->{nested}; print STDOUT qq[
      Explicit entries
      ]; + my $i = 0; for my $uri (@{$manifest->[0]}) { my $euri = htescape ($uri); - print STDOUT qq[
      <$euri>
      ]; + print STDOUT qq[
      <$euri>
      ]; } print STDOUT qq[
      Fallback entries
      @@ -482,27 +834,28 @@ for my $uri (sort {$a cmp $b} keys %{$manifest->[1]}) { my $euri = htescape ($uri); my $euri2 = htescape ($manifest->[1]->{$uri}); - print STDOUT qq[<$euri> - <$euri2>]; + print STDOUT qq[<$euri> + <$euri2>]; } print STDOUT qq[
      Online whitelist
      ]; for my $uri (@{$manifest->[2]}) { my $euri = htescape ($uri); - print STDOUT qq[
      <$euri>
      ]; + print STDOUT qq[
      <$euri>
      ]; } print STDOUT qq[
      ]; } # print_structure_dump_manifest_section -sub print_structure_error_dom_section ($$$) { - my ($doc, $el, $result) = @_; +sub print_structure_error_dom_section ($$$$$) { + my ($input, $doc, $el, $result, $onsubdoc) = @_; - print STDOUT qq[
      + print STDOUT qq[

      Document Errors

      ]; - push @nav, ['#document-errors' => 'Document Error']; + push @nav, [qq[#$input->{id_prefix}document-errors] => 'Document Error'] + unless $input->{nested}; require Whatpm::ContentChecker; my $onerror = sub { @@ -511,7 +864,7 @@ $type =~ tr/ /-/; $type =~ s/\|/%7C/g; $msg .= qq[ [Description]]; - print STDOUT qq[
      ] . get_error_label (\%opt) . + print STDOUT qq[
      ] . get_error_label ($input, \%opt) . qq[
      \n
      ], get_error_level_label (\%opt); print STDOUT $msg, "
      \n"; add_error ('structure', \%opt => $result); @@ -520,9 +873,11 @@ my $elements; my $time1 = time; if ($el) { - $elements = Whatpm::ContentChecker->check_element ($el, $onerror); + $elements = Whatpm::ContentChecker->check_element + ($el, $onerror, $onsubdoc); } else { - $elements = Whatpm::ContentChecker->check_document ($doc, $onerror); + $elements = Whatpm::ContentChecker->check_document + ($doc, $onerror, $onsubdoc); } $time{check} = time - $time1; @@ -532,13 +887,14 @@ } # print_structure_error_dom_section sub print_structure_error_manifest_section ($$$) { - my ($manifest, $result) = @_; + my ($input, $manifest, $result) = @_; - print STDOUT qq[
      + print STDOUT qq[

      Document Errors

      ]; - push @nav, ['#document-errors' => 'Document Error']; + push @nav, [qq[#$input->{id_prefix}document-errors] => 'Document Error'] + unless $input->{nested}; require Whatpm::CacheManifest; Whatpm::CacheManifest->check_manifest ($manifest, sub { @@ -547,7 +903,7 @@ $type =~ tr/ /-/; $type =~ s/\|/%7C/g; $msg .= qq[ [Description]]; - print STDOUT qq[
      ] . get_error_label (\%opt) . + print STDOUT qq[
      ] . get_error_label ($input, \%opt) . qq[
      \n
      ], $msg, "
      \n"; add_error ('structure', \%opt => $result); }); @@ -555,12 +911,13 @@ 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

      @@ -575,8 +932,8 @@ my $i = 0; for my $table_el (@$tables) { $i++; - print STDOUT qq[

      ] . - get_node_link ($table_el) . q[

      ]; + print STDOUT qq[

      ] . + get_node_link ($input, $table_el) . q[

      ]; ## TODO: Make |ContentChecker| return |form_table| result ## so that this script don't have to run the algorithm twice. @@ -608,68 +965,32 @@ 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[
      ]; -} # print_id_section - -sub print_term_section ($) { - my $terms = shift; - - push @nav, ['#terms' => 'Terms']; - print STDOUT qq[ -
      -

      Terms

      - -
      -]; - 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; - - push @nav, ['#classes' => 'Classes']; - print STDOUT qq[ -
      -

      Classes

      - -
      -]; - for my $class (sort {$a cmp $b} keys %$classes) { - print STDOUT qq[
      @{[htescape $class]}
      ]; - for (@{$classes->{$class}}) { - print STDOUT qq[
      ].get_node_link ($_).qq[
      ]; + print STDOUT qq[
      ].get_node_link ($input, $_).qq[
      ]; } } print STDOUT qq[
      ]; -} # print_class_section +} # print_listing_section sub print_result_section ($) { my $result = shift; @@ -767,7 +1088,7 @@ my $euri = htescape ($input->{uri}); print STDOUT qq[ -
      +

      Errors

      @@ -780,10 +1101,11 @@
      ]; - push @nav, ['#parse-errors' => 'Errors']; - add_error (char => {level => 'unsupported'} => $result); - add_error (syntax => {level => 'unsupported'} => $result); - add_error (structure => {level => 'unsupported'} => $result); + push @nav, [qq[#$input->{id_prefix}parse-errors] => 'Errors'] + unless $input->{nested}; + add_error (char => {level => 'u'} => $result); + add_error (syntax => {level => 'u'} => $result); + add_error (structure => {level => 'u'} => $result); } # print_result_unknown_type_section sub print_result_input_error_section ($) { @@ -792,30 +1114,41 @@

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

      ]; push @nav, ['#result-summary' => 'Result']; -} # print_Result_input_error_section +} # print_result_input_error_section -sub get_error_label ($) { - my $err = shift; +sub get_error_label ($$) { + my ($input, $err) = @_; my $r = ''; - if (defined $err->{line}) { + if (defined $err->{token} and defined $err->{token}->{line}) { + if ($err->{token}->{column} > 0) { + $r = qq[Line $err->{token}->{line} column $err->{token}->{column}]; + } else { + $err->{token}->{line} = $err->{token}->{line} - 1 || 1; + $r = qq[Line $err->{token}->{line}]; + } + } elsif (defined $err->{line}) { if ($err->{column} > 0) { - $r = qq[Line $err->{line} column $err->{column}]; + $r = qq[Line $err->{line} column $err->{column}]; } else { $err->{line} = $err->{line} - 1 || 1; - $r = qq[Line $err->{line}]; + $r = qq[Line $err->{line}]; } } if (defined $err->{node}) { $r .= ' ' if length $r; - $r = get_node_link ($err->{node}); + $r = get_node_link ($input, $err->{node}); } if (defined $err->{index}) { - $r .= ' ' if length $r; - $r .= 'Index ' . (0+$err->{index}); + if (length $r) { + $r .= ', Index ' . (0+$err->{index}); + } else { + $r .= "Index " + . (0+$err->{index}) . ''; + } } if (defined $err->{value}) { @@ -840,9 +1173,11 @@ } elsif ($err->{level} eq 'w') { $r = qq[Warning: ]; - } elsif ($err->{level} eq 'unsupported') { + } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') { $r = qq[Not supported: ]; + } elsif ($err->{level} eq 'i') { + $r = qq[Information: ]; } else { my $elevel = htescape ($err->{level}); $r = qq[$elevel: @@ -879,9 +1214,9 @@ return join '/', @r; } # get_node_path -sub get_node_link ($) { - return qq[] . - htescape (get_node_path ($_[0])) . qq[]; +sub get_node_link ($$) { + return qq[] . + htescape (get_node_path ($_[1])) . qq[]; } # get_node_link { @@ -889,7 +1224,8 @@ sub load_text_catalog ($) { 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, $_); @@ -902,6 +1238,7 @@ sub get_text ($) { my ($type, $level, $node) = @_; $type = $level . ':' . $type if defined $level; + $level = 'm' unless defined $level; my @arg; { if (defined $Msg->{$type}) { @@ -926,13 +1263,13 @@ ? htescape ($node->owner_element->manakai_local_name) : '' }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, htescape ($_[0])); } # get_text } @@ -988,6 +1325,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')) { @@ -997,12 +1335,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'); @@ -1010,9 +1346,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; @@ -1033,7 +1382,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'); @@ -1050,6 +1410,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; } @@ -1061,6 +1422,8 @@ return $r; } + $r->{inner_html_element} = $http->get_parameter ('e'); + return $r; } # get_input_document @@ -1093,11 +1456,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/11 06:57:16 $ +## $Date: 2008/03/16 11:38:47 $