/[pub]/test/html-webhacc/cc.cgi
Suika

Diff of /test/html-webhacc/cc.cgi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.23 by wakaba, Mon Nov 5 09:33:52 2007 UTC revision 1.32 by wakaba, Sun Feb 10 02:30:14 2008 UTC
# Line 52  sub htescape ($) { Line 52  sub htescape ($) {
52    
53    $| = 0;    $| = 0;
54    my $input = get_input_document ($http, $dom);    my $input = get_input_document ($http, $dom);
   my $inner_html_element = $http->get_parameter ('e');  
55    my $char_length = 0;    my $char_length = 0;
56    my %time;    my %time;
57    
# Line 62  sub htescape ($) { Line 61  sub htescape ($) {
61  <dt>Request URI</dt>  <dt>Request URI</dt>
62      <dd><code class="URI" lang="">&lt;<a href="@{[htescape $input->{request_uri}]}">@{[htescape $input->{request_uri}]}</a>&gt;</code></dd>      <dd><code class="URI" lang="">&lt;<a href="@{[htescape $input->{request_uri}]}">@{[htescape $input->{request_uri}]}</a>&gt;</code></dd>
63  <dt>Document URI</dt>  <dt>Document URI</dt>
64      <dd><code class="URI" lang="">&lt;<a href="@{[htescape $input->{uri}]}">@{[htescape $input->{uri}]}</a>&gt;</code></dd>      <dd><code class="URI" lang="">&lt;<a href="@{[htescape $input->{uri}]}" id=anchor-document-uri>@{[htescape $input->{uri}]}</a>&gt;</code>
65        <script>
66          document.title = '<'
67              + document.getElementById ('anchor-document-uri').href + '> \\u2014 '
68              + document.title;
69        </script></dd>
70  ]; # no </dl> yet  ]; # no </dl> yet
71    push @nav, ['#document-info' => 'Information'];    push @nav, ['#document-info' => 'Information'];
72    
# Line 74  if (defined $input->{s}) { Line 78  if (defined $input->{s}) {
78      <dd><code class="URI" lang="">&lt;<a href="@{[htescape $input->{base_uri}]}">@{[htescape $input->{base_uri}]}</a>&gt;</code></dd>      <dd><code class="URI" lang="">&lt;<a href="@{[htescape $input->{base_uri}]}">@{[htescape $input->{base_uri}]}</a>&gt;</code></dd>
79  <dt>Internet Media Type</dt>  <dt>Internet Media Type</dt>
80      <dd><code class="MIME" lang="en">@{[htescape $input->{media_type}]}</code>      <dd><code class="MIME" lang="en">@{[htescape $input->{media_type}]}</code>
81      @{[$input->{media_type_overridden} ? '<em>(overridden)</em>' : '']}</dd>      @{[$input->{media_type_overridden} ? '<em>(overridden)</em>' : defined $input->{official_type} ? $input->{media_type} eq $input->{official_type} ? '' : '<em>(sniffed; official type is: <code class=MIME lang=en>'.htescape ($input->{official_type}).'</code>)' : '<em>(sniffed)</em>']}</dd>
82  <dt>Character Encoding</dt>  <dt>Character Encoding</dt>
83      <dd>@{[defined $input->{charset} ? '<code class="charset" lang="en">'.htescape ($input->{charset}).'</code>' : '(none)']}      <dd>@{[defined $input->{charset} ? '<code class="charset" lang="en">'.htescape ($input->{charset}).'</code>' : '(none)']}
84      @{[$input->{charset_overridden} ? '<em>(overridden)</em>' : '']}</dd>      @{[$input->{charset_overridden} ? '<em>(overridden)</em>' : '']}</dd>
# Line 85  if (defined $input->{s}) { Line 89  if (defined $input->{s}) {
89  ];  ];
90    
91    my $result = {conforming_min => 1, conforming_max => 1};    my $result = {conforming_min => 1, conforming_max => 1};
92    print_http_header_section ($input, $result);    check_and_print ($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);  
   }  
   
   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);  
   }  
   
93    print_result_section ($result);    print_result_section ($result);
94  } else {  } else {
95    print STDOUT qq[</dl></div>];    print STDOUT qq[</dl></div>];
# Line 143  if (defined $input->{s}) { Line 108  if (defined $input->{s}) {
108  </html>  </html>
109  ];  ];
110    
111    for (qw/decode parse parse_xml parse_manifest check check_manifest/) {    for (qw/decode parse parse_html parse_xml parse_manifest
112              check check_manifest/) {
113      next unless defined $time{$_};      next unless defined $time{$_};
114      open my $file, '>>', ".cc-$_.txt" or die ".cc-$_.txt: $!";      open my $file, '>>', ".cc-$_.txt" or die ".cc-$_.txt: $!";
115      print $file $char_length, "\t", $time{$_}, "\n";      print $file $char_length, "\t", $time{$_}, "\n";
# Line 160  sub add_error ($$$) { Line 126  sub add_error ($$$) {
126        $result->{conforming_min} = 0;        $result->{conforming_min} = 0;
127      } elsif ($err->{level} eq 'w' or $err->{level} eq 'g') {      } elsif ($err->{level} eq 'w' or $err->{level} eq 'g') {
128        $result->{$layer}->{warning}++;        $result->{$layer}->{warning}++;
129      } elsif ($err->{level} eq 'unsupported') {      } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') {
130        $result->{$layer}->{unsupported}++;        $result->{$layer}->{unsupported}++;
131        $result->{unsupported} = 1;        $result->{unsupported} = 1;
132      } else {      } else {
# Line 179  sub add_error ($$$) { Line 145  sub add_error ($$$) {
145    }    }
146  } # add_error  } # add_error
147    
148    sub check_and_print ($$) {
149      my ($input, $result) = @_;
150      $input->{id_prefix} = '';
151      #$input->{nested} = 1/0;
152    
153      print_http_header_section ($input, $result);
154    
155      my $doc;
156      my $el;
157      my $manifest;
158    
159      if ($input->{media_type} eq 'text/html') {
160        ($doc, $el) = print_syntax_error_html_section ($input, $result);
161        print_source_string_section
162            (\($input->{s}), $input->{charset} || $doc->input_encoding);
163      } elsif ({
164                'text/xml' => 1,
165                'application/atom+xml' => 1,
166                'application/rss+xml' => 1,
167                'application/svg+xml' => 1,
168                'application/xhtml+xml' => 1,
169                'application/xml' => 1,
170               }->{$input->{media_type}}) {
171        ($doc, $el) = print_syntax_error_xml_section ($input, $result);
172        print_source_string_section (\($input->{s}), $doc->input_encoding);
173      } elsif ($input->{media_type} eq 'text/cache-manifest') {
174    ## TODO: MUST be text/cache-manifest
175        $manifest = print_syntax_error_manifest_section ($input, $result);
176        print_source_string_section (\($input->{s}), 'utf-8');
177      } else {
178        ## TODO: Change HTTP status code??
179        print_result_unknown_type_section ($input, $result);
180      }
181    
182      if (defined $doc or defined $el) {
183        print_structure_dump_dom_section ($input, $doc, $el);
184        my $elements = print_structure_error_dom_section
185            ($input, $doc, $el, $result);
186        print_table_section ($input, $elements->{table}) if @{$elements->{table}};
187        print_id_section ($input, $elements->{id}) if keys %{$elements->{id}};
188        print_term_section ($input, $elements->{term}) if keys %{$elements->{term}};
189        print_class_section ($input, $elements->{class}) if keys %{$elements->{class}};
190      } elsif (defined $manifest) {
191        print_structure_dump_manifest_section ($input, $manifest);
192        print_structure_error_manifest_section ($input, $manifest, $result);
193      }
194    } # check_and_print
195    
196  sub print_http_header_section ($$) {  sub print_http_header_section ($$) {
197    my ($input, $result) = @_;    my ($input, $result) = @_;
198    return unless defined $input->{header_status_code} or    return unless defined $input->{header_status_code} or
199        defined $input->{header_status_text} or        defined $input->{header_status_text} or
200        @{$input->{header_field}};        @{$input->{header_field}};
201        
202    push @nav, ['#source-header' => 'HTTP Header'];    push @nav, ['#source-header' => 'HTTP Header'] unless $input->{nested};
203    print STDOUT qq[<div id="source-header" class="section">    print STDOUT qq[<div id="$input->{id_prefix}source-header" class="section">
204  <h2>HTTP Header</h2>  <h2>HTTP Header</h2>
205    
206  <p><strong>Note</strong>: Due to the limitation of the  <p><strong>Note</strong>: Due to the limitation of the
# Line 218  sub print_syntax_error_html_section ($$) Line 232  sub print_syntax_error_html_section ($$)
232        
233    require Encode;    require Encode;
234    require Whatpm::HTML;    require Whatpm::HTML;
   
   $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now.  
235        
   my $time1 = time;  
   my $t = Encode::decode ($input->{charset}, $input->{s});  
   $time{decode} = time - $time1;  
   
236    print STDOUT qq[    print STDOUT qq[
237  <div id="parse-errors" class="section">  <div id="$input->{id_prefix}parse-errors" class="section">
238  <h2>Parse Errors</h2>  <h2>Parse Errors</h2>
239    
240  <dl>];  <dl>];
241    push @nav, ['#parse-errors' => 'Parse Error'];    push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested};
242    
243    my $onerror = sub {    my $onerror = sub {
244      my (%opt) = @_;      my (%opt) = @_;
# Line 252  sub print_syntax_error_html_section ($$) Line 260  sub print_syntax_error_html_section ($$)
260    
261    my $doc = $dom->create_document;    my $doc = $dom->create_document;
262    my $el;    my $el;
263    $time1 = time;    my $inner_html_element = $http->get_parameter ('e');
264    if (defined $inner_html_element and length $inner_html_element) {    if (defined $inner_html_element and length $inner_html_element) {
265        $input->{charset} ||= 'windows-1252'; ## TODO: for now.
266        my $time1 = time;
267        my $t = Encode::decode ($input->{charset}, $input->{s});
268        $time{decode} = time - $time1;
269        
270      $el = $doc->create_element_ns      $el = $doc->create_element_ns
271          ('http://www.w3.org/1999/xhtml', [undef, $inner_html_element]);          ('http://www.w3.org/1999/xhtml', [undef, $inner_html_element]);
272        $time1 = time;
273      Whatpm::HTML->set_inner_html ($el, $t, $onerror);      Whatpm::HTML->set_inner_html ($el, $t, $onerror);
274        $time{parse} = time - $time1;
275    } else {    } else {
276      Whatpm::HTML->parse_string ($t => $doc, $onerror);      my $time1 = time;
277        Whatpm::HTML->parse_byte_string
278            ($input->{charset}, $input->{s} => $doc, $onerror);
279        $time{parse_html} = time - $time1;
280    }    }
281    $time{parse} = time - $time1;    $doc->manakai_charset ($input->{official_charset})
282          if defined $input->{official_charset};
283      
284    print STDOUT qq[</dl></div>];    print STDOUT qq[</dl></div>];
285    
286    return ($doc, $el);    return ($doc, $el);
# Line 273  sub print_syntax_error_xml_section ($$) Line 292  sub print_syntax_error_xml_section ($$)
292    require Message::DOM::XMLParserTemp;    require Message::DOM::XMLParserTemp;
293        
294    print STDOUT qq[    print STDOUT qq[
295  <div id="parse-errors" class="section">  <div id="$input->{id_prefix}parse-errors" class="section">
296  <h2>Parse Errors</h2>  <h2>Parse Errors</h2>
297    
298  <dl>];  <dl>];
299    push @nav, ['#parse-errors' => 'Parse Error'];    push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{prefix};
300    
301    my $onerror = sub {    my $onerror = sub {
302      my $err = shift;      my $err = shift;
# Line 301  sub print_syntax_error_xml_section ($$) Line 320  sub print_syntax_error_xml_section ($$)
320    my $doc = Message::DOM::XMLParserTemp->parse_byte_stream    my $doc = Message::DOM::XMLParserTemp->parse_byte_stream
321        ($fh => $dom, $onerror, charset => $input->{charset});        ($fh => $dom, $onerror, charset => $input->{charset});
322    $time{parse_xml} = time - $time1;    $time{parse_xml} = time - $time1;
323      $doc->manakai_charset ($input->{official_charset})
324          if defined $input->{official_charset};
325    
326    print STDOUT qq[</dl></div>];    print STDOUT qq[</dl></div>];
327    
# Line 313  sub print_syntax_error_manifest_section Line 334  sub print_syntax_error_manifest_section
334    require Whatpm::CacheManifest;    require Whatpm::CacheManifest;
335    
336    print STDOUT qq[    print STDOUT qq[
337  <div id="parse-errors" class="section">  <div id="$input->{id_prefix}parse-errors" class="section">
338  <h2>Parse Errors</h2>  <h2>Parse Errors</h2>
339    
340  <dl>];  <dl>];
341    push @nav, ['#parse-errors' => 'Parse Error'];    push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested};
342    
343    my $onerror = sub {    my $onerror = sub {
344      my (%opt) = @_;      my (%opt) = @_;
345      my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});      my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
346      print STDOUT qq[<dt class="$cls">], get_error_label (\%opt), qq[</dt>];      print STDOUT qq[<dt class="$cls">], get_error_label ($input, \%opt),
347            qq[</dt>];
348      $type =~ tr/ /-/;      $type =~ tr/ /-/;
349      $type =~ s/\|/%7C/g;      $type =~ s/\|/%7C/g;
350      $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];      $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
# Line 349  sub print_source_string_section ($$) { Line 371  sub print_source_string_section ($$) {
371    
372    my $s = \($enc->decode (${$_[0]}));    my $s = \($enc->decode (${$_[0]}));
373    my $i = 1;                                my $i = 1;                            
374    push @nav, ['#source-string' => 'Source'];    push @nav, ['#source-string' => 'Source'] unless $input->{nested};
375    print STDOUT qq[<div id="source-string" class="section">    print STDOUT qq[<div id="$input->{id_prefix}source-string" class="section">
376  <h2>Document Source</h2>  <h2>Document Source</h2>
377  <ol lang="">\n];  <ol lang="">\n];
378    if (length $$s) {    if (length $$s) {
379      while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) {      while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) {
380        print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";        print STDOUT qq[<li id="$input->{id_prefix}line-$i">], htescape $1,
381              "</li>\n";
382        $i++;        $i++;
383      }      }
384      if ($$s =~ /\G([^\x0A]+)/gc) {      if ($$s =~ /\G([^\x0A]+)/gc) {
385        print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";        print STDOUT qq[<li id="$input->{id_prefix}line-$i">], htescape $1,
386              "</li>\n";
387      }      }
388    } else {    } else {
389      print STDOUT q[<li id="line-1"></li>];      print STDOUT q[<li id="$input->{id_prefix}line-1"></li>];
390    }    }
391    print STDOUT "</ol></div>";    print STDOUT "</ol></div>";
392  } # print_input_string_section  } # print_input_string_section
# Line 379  sub print_document_tree ($) { Line 403  sub print_document_tree ($) {
403        next;        next;
404      }      }
405    
406      my $node_id = 'node-'.refaddr $child;      my $node_id = $input->{id_prefix} . 'node-'.refaddr $child;
407      my $nt = $child->node_type;      my $nt = $child->node_type;
408      if ($nt == $child->ELEMENT_NODE) {      if ($nt == $child->ELEMENT_NODE) {
409        my $child_nsuri = $child->namespace_uri;        my $child_nsuri = $child->namespace_uri;
# Line 390  sub print_document_tree ($) { Line 414  sub print_document_tree ($) {
414          $r .= '<ul class="attributes">';          $r .= '<ul class="attributes">';
415          for my $attr (sort {$a->[0] cmp $b->[0]} map { [$_->name, $_->value, $_->namespace_uri, 'node-'.refaddr $_] }          for my $attr (sort {$a->[0] cmp $b->[0]} map { [$_->name, $_->value, $_->namespace_uri, 'node-'.refaddr $_] }
416                        @{$child->attributes}) {                        @{$child->attributes}) {
417            $r .= qq[<li id="$attr->[3]" class="tree-attribute"><code title="@{[defined $_->[2] ? $_->[2] : '']}">] . htescape ($attr->[0]) . '</code> = '; ## ISSUE: case?            $r .= qq[<li id="$input->{id_prefix}$attr->[3]" class="tree-attribute"><code title="@{[defined $attr->[2] ? htescape ($attr->[2]) : '']}">] . htescape ($attr->[0]) . '</code> = '; ## ISSUE: case?
418            $r .= '<q>' . htescape ($attr->[1]) . '</q></li>'; ## TODO: children            $r .= '<q>' . htescape ($attr->[1]) . '</q></li>'; ## TODO: children
419          }          }
420          $r .= '</ul>';          $r .= '</ul>';
# Line 411  sub print_document_tree ($) { Line 435  sub print_document_tree ($) {
435      } elsif ($nt == $child->DOCUMENT_NODE) {      } elsif ($nt == $child->DOCUMENT_NODE) {
436        $r .= qq'<li id="$node_id" class="tree-document">Document';        $r .= qq'<li id="$node_id" class="tree-document">Document';
437        $r .= qq[<ul class="attributes">];        $r .= qq[<ul class="attributes">];
438          my $cp = $child->manakai_charset;
439          if (defined $cp) {
440            $r .= qq[<li><code>charset</code> parameter = <code>];
441            $r .= htescape ($cp) . qq[</code></li>];
442          }
443          $r .= qq[<li><code>inputEncoding</code> = ];
444          my $ie = $child->input_encoding;
445          if (defined $ie) {
446            $r .= qq[<code>@{[htescape ($ie)]}</code>];
447            if ($child->manakai_has_bom) {
448              $r .= qq[ (with <code class=charname><abbr>BOM</abbr></code>)];
449            }
450          } else {
451            $r .= qq[(<code>null</code>)];
452          }
453        $r .= qq[<li>@{[scalar get_text ('manakaiIsHTML:'.($child->manakai_is_html?1:0))]}</li>];        $r .= qq[<li>@{[scalar get_text ('manakaiIsHTML:'.($child->manakai_is_html?1:0))]}</li>];
454        $r .= qq[<li>@{[scalar get_text ('manakaiCompatMode:'.$child->manakai_compat_mode)]}</li>];        $r .= qq[<li>@{[scalar get_text ('manakaiCompatMode:'.$child->manakai_compat_mode)]}</li>];
455        unless ($child->manakai_is_html) {        unless ($child->manakai_is_html) {
# Line 444  sub print_document_tree ($) { Line 483  sub print_document_tree ($) {
483    print STDOUT $r;    print STDOUT $r;
484  } # print_document_tree  } # print_document_tree
485    
486  sub print_structure_dump_dom_section ($$) {  sub print_structure_dump_dom_section ($$$) {
487    my ($doc, $el) = @_;    my ($input, $doc, $el) = @_;
488    
489    print STDOUT qq[    print STDOUT qq[
490  <div id="document-tree" class="section">  <div id="$input->{id_prefix}document-tree" class="section">
491  <h2>Document Tree</h2>  <h2>Document Tree</h2>
492  ];  ];
493    push @nav, ['#document-tree' => 'Tree'];    push @nav, ['#document-tree' => 'Tree'] unless $input->{nested};
494    
495    print_document_tree ($el || $doc);    print_document_tree ($el || $doc);
496    
497    print STDOUT qq[</div>];    print STDOUT qq[</div>];
498  } # print_structure_dump_dom_section  } # print_structure_dump_dom_section
499    
500  sub print_structure_dump_manifest_section ($) {  sub print_structure_dump_manifest_section ($$) {
501    my $manifest = shift;    my ($input, $manifest) = @_;
502    
503    print STDOUT qq[    print STDOUT qq[
504  <div id="dump-manifest" class="section">  <div id="$input->{id_prefix}dump-manifest" class="section">
505  <h2>Cache Manifest</h2>  <h2>Cache Manifest</h2>
506  ];  ];
507    push @nav, ['#dump-manifest' => 'Caceh Manifest'];    push @nav, ['#dump-manifest' => 'Caceh Manifest'] unless $input->{nested};
508    
509    print STDOUT qq[<dl><dt>Explicit entries</dt>];    print STDOUT qq[<dl><dt>Explicit entries</dt>];
510    for my $uri (@{$manifest->[0]}) {    for my $uri (@{$manifest->[0]}) {
# Line 492  sub print_structure_dump_manifest_sectio Line 531  sub print_structure_dump_manifest_sectio
531    print STDOUT qq[</dl></div>];    print STDOUT qq[</dl></div>];
532  } # print_structure_dump_manifest_section  } # print_structure_dump_manifest_section
533    
534  sub print_structure_error_dom_section ($$$) {  sub print_structure_error_dom_section ($$$$) {
535    my ($doc, $el, $result) = @_;    my ($input, $doc, $el, $result) = @_;
536    
537    print STDOUT qq[<div id="document-errors" class="section">    print STDOUT qq[<div id="$input->{id_prefix}document-errors" class="section">
538  <h2>Document Errors</h2>  <h2>Document Errors</h2>
539    
540  <dl>];  <dl>];
541    push @nav, ['#document-errors' => 'Document Error'];    push @nav, ['#document-errors' => 'Document Error'] unless $input->{nested};
542    
543    require Whatpm::ContentChecker;    require Whatpm::ContentChecker;
544    my $onerror = sub {    my $onerror = sub {
# Line 508  sub print_structure_error_dom_section ($ Line 547  sub print_structure_error_dom_section ($
547      $type =~ tr/ /-/;      $type =~ tr/ /-/;
548      $type =~ s/\|/%7C/g;      $type =~ s/\|/%7C/g;
549      $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];      $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
550      print STDOUT qq[<dt class="$cls">] . get_error_label (\%opt) .      print STDOUT qq[<dt class="$cls">] . get_error_label ($input, \%opt) .
551          qq[</dt>\n<dd class="$cls">], get_error_level_label (\%opt);          qq[</dt>\n<dd class="$cls">], get_error_level_label (\%opt);
552      print STDOUT $msg, "</dd>\n";      print STDOUT $msg, "</dd>\n";
553      add_error ('structure', \%opt => $result);      add_error ('structure', \%opt => $result);
# Line 529  sub print_structure_error_dom_section ($ Line 568  sub print_structure_error_dom_section ($
568  } # print_structure_error_dom_section  } # print_structure_error_dom_section
569    
570  sub print_structure_error_manifest_section ($$$) {  sub print_structure_error_manifest_section ($$$) {
571    my ($manifest, $result) = @_;    my ($input, $manifest, $result) = @_;
572    
573    print STDOUT qq[<div id="document-errors" class="section">    print STDOUT qq[<div id="$input->{id_prefix}document-errors" class="section">
574  <h2>Document Errors</h2>  <h2>Document Errors</h2>
575    
576  <dl>];  <dl>];
577    push @nav, ['#document-errors' => 'Document Error'];    push @nav, ['#document-errors' => 'Document Error'] unless $input->{nested};
578    
579    require Whatpm::CacheManifest;    require Whatpm::CacheManifest;
580    Whatpm::CacheManifest->check_manifest ($manifest, sub {    Whatpm::CacheManifest->check_manifest ($manifest, sub {
# Line 544  sub print_structure_error_manifest_secti Line 583  sub print_structure_error_manifest_secti
583      $type =~ tr/ /-/;      $type =~ tr/ /-/;
584      $type =~ s/\|/%7C/g;      $type =~ s/\|/%7C/g;
585      $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];      $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
586      print STDOUT qq[<dt class="$cls">] . get_error_label (\%opt) .      print STDOUT qq[<dt class="$cls">] . get_error_label ($input, \%opt) .
587          qq[</dt>\n<dd class="$cls">], $msg, "</dd>\n";          qq[</dt>\n<dd class="$cls">], $msg, "</dd>\n";
588      add_error ('structure', \%opt => $result);      add_error ('structure', \%opt => $result);
589    });    });
# Line 552  sub print_structure_error_manifest_secti Line 591  sub print_structure_error_manifest_secti
591    print STDOUT qq[</div>];    print STDOUT qq[</div>];
592  } # print_structure_error_manifest_section  } # print_structure_error_manifest_section
593    
594  sub print_table_section ($) {  sub print_table_section ($$) {
595    my $tables = shift;    my ($input, $tables) = @_;
596        
597    push @nav, ['#tables' => 'Tables'];    push @nav, ['#tables' => 'Tables'] unless $input->{nested};
598    print STDOUT qq[    print STDOUT qq[
599  <div id="tables" class="section">  <div id="$input->{id_prefix}tables" class="section">
600  <h2>Tables</h2>  <h2>Tables</h2>
601    
602  <!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->  <!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
# Line 572  sub print_table_section ($) { Line 611  sub print_table_section ($) {
611    my $i = 0;    my $i = 0;
612    for my $table_el (@$tables) {    for my $table_el (@$tables) {
613      $i++;      $i++;
614      print STDOUT qq[<div class="section" id="table-$i"><h3>] .      print STDOUT qq[<div class="section" id="$input->{id_prefix}table-$i"><h3>] .
615          get_node_link ($table_el) . q[</h3>];          get_node_link ($input, $table_el) . q[</h3>];
616    
617      ## TODO: Make |ContentChecker| return |form_table| result      ## TODO: Make |ContentChecker| return |form_table| result
618      ## so that this script don't have to run the algorithm twice.      ## so that this script don't have to run the algorithm twice.
# Line 605  sub print_table_section ($) { Line 644  sub print_table_section ($) {
644                    
645      print STDOUT '</div><script type="text/javascript">tableToCanvas (';      print STDOUT '</div><script type="text/javascript">tableToCanvas (';
646      print STDOUT JSON::objToJson ($table);      print STDOUT JSON::objToJson ($table);
647      print STDOUT qq[, document.getElementById ('table-$i'));</script>];      print STDOUT qq[, document.getElementById ('$input->{id_prefix}table-$i')];
648        print STDOUT qq[, '$input->{id_prefix}');</script>];
649    }    }
650        
651    print STDOUT qq[</div>];    print STDOUT qq[</div>];
652  } # print_table_section  } # print_table_section
653    
654  sub print_id_section ($) {  sub print_id_section ($$) {
655    my $ids = shift;    my ($input, $ids) = @_;
656        
657    push @nav, ['#identifiers' => 'IDs'];    push @nav, ['#identifiers' => 'IDs'] unless $input->{nested};
658    print STDOUT qq[    print STDOUT qq[
659  <div id="identifiers" class="section">  <div id="$input->{id_prefix}identifiers" class="section">
660  <h2>Identifiers</h2>  <h2>Identifiers</h2>
661    
662  <dl>  <dl>
# Line 624  sub print_id_section ($) { Line 664  sub print_id_section ($) {
664    for my $id (sort {$a cmp $b} keys %$ids) {    for my $id (sort {$a cmp $b} keys %$ids) {
665      print STDOUT qq[<dt><code>@{[htescape $id]}</code></dt>];      print STDOUT qq[<dt><code>@{[htescape $id]}</code></dt>];
666      for (@{$ids->{$id}}) {      for (@{$ids->{$id}}) {
667        print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];        print STDOUT qq[<dd>].get_node_link ($input, $_).qq[</dd>];
668      }      }
669    }    }
670    print STDOUT qq[</dl></div>];    print STDOUT qq[</dl></div>];
671  } # print_id_section  } # print_id_section
672    
673  sub print_term_section ($) {  sub print_term_section ($$) {
674    my $terms = shift;    my ($input, $terms) = @_;
675        
676    push @nav, ['#terms' => 'Terms'];    push @nav, ['#terms' => 'Terms'] unless $input->{nested};
677    print STDOUT qq[    print STDOUT qq[
678  <div id="terms" class="section">  <div id="$input->{id_prefix}terms" class="section">
679  <h2>Terms</h2>  <h2>Terms</h2>
680    
681  <dl>  <dl>
# Line 643  sub print_term_section ($) { Line 683  sub print_term_section ($) {
683    for my $term (sort {$a cmp $b} keys %$terms) {    for my $term (sort {$a cmp $b} keys %$terms) {
684      print STDOUT qq[<dt>@{[htescape $term]}</dt>];      print STDOUT qq[<dt>@{[htescape $term]}</dt>];
685      for (@{$terms->{$term}}) {      for (@{$terms->{$term}}) {
686        print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];        print STDOUT qq[<dd>].get_node_link ($input, $_).qq[</dd>];
687      }      }
688    }    }
689    print STDOUT qq[</dl></div>];    print STDOUT qq[</dl></div>];
690  } # print_term_section  } # print_term_section
691    
692  sub print_class_section ($) {  sub print_class_section ($$) {
693    my $classes = shift;    my ($input, $classes) = @_;
694        
695    push @nav, ['#classes' => 'Classes'];    push @nav, ['#classes' => 'Classes'] unless $input->{nested};
696    print STDOUT qq[    print STDOUT qq[
697  <div id="classes" class="section">  <div id="$input->{id_prefix}classes" class="section">
698  <h2>Classes</h2>  <h2>Classes</h2>
699    
700  <dl>  <dl>
# Line 662  sub print_class_section ($) { Line 702  sub print_class_section ($) {
702    for my $class (sort {$a cmp $b} keys %$classes) {    for my $class (sort {$a cmp $b} keys %$classes) {
703      print STDOUT qq[<dt><code>@{[htescape $class]}</code></dt>];      print STDOUT qq[<dt><code>@{[htescape $class]}</code></dt>];
704      for (@{$classes->{$class}}) {      for (@{$classes->{$class}}) {
705        print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];        print STDOUT qq[<dd>].get_node_link ($input, $_).qq[</dd>];
706      }      }
707    }    }
708    print STDOUT qq[</dl></div>];    print STDOUT qq[</dl></div>];
# Line 759  is <em>under development</em>.  The resu Line 799  is <em>under development</em>.  The resu
799    push @nav, ['#result-summary' => 'Result'];    push @nav, ['#result-summary' => 'Result'];
800  } # print_result_section  } # print_result_section
801    
802  sub print_result_unknown_type_section ($) {  sub print_result_unknown_type_section ($$) {
803    my $input = shift;    my ($input, $result) = @_;
804    
805      my $euri = htescape ($input->{uri});
806    print STDOUT qq[    print STDOUT qq[
807  <div id="result-summary" class="section">  <div id="parse-errors" class="section">
808  <p><em>Media type <code class="MIME" lang="en">@{[htescape $input->{media_type}]}</code> is not supported!</em></p>  <h2>Errors</h2>
809    
810    <dl>
811    <dt class=unsupported><code>&lt;<a href="$euri">$euri</a>&gt;</code></dt>
812        <dd class=unsupported><strong><a href="../error-description#level-u">Not
813            supported</a></strong>:
814        Media type
815        <code class="MIME" lang="en">@{[htescape $input->{media_type}]}</code>
816        is not supported.</dd>
817    </dl>
818  </div>  </div>
819  ];  ];
820    push @nav, ['#result-summary' => 'Result'];    push @nav, ['#parse-errors' => 'Errors'];
821      add_error (char => {level => 'u'} => $result);
822      add_error (syntax => {level => 'u'} => $result);
823      add_error (structure => {level => 'u'} => $result);
824  } # print_result_unknown_type_section  } # print_result_unknown_type_section
825    
826  sub print_result_input_error_section ($) {  sub print_result_input_error_section ($) {
# Line 776  sub print_result_input_error_section ($) Line 829  sub print_result_input_error_section ($)
829  <p><em><strong>Input Error</strong>: @{[htescape ($input->{error_status_text})]}</em></p>  <p><em><strong>Input Error</strong>: @{[htescape ($input->{error_status_text})]}</em></p>
830  </div>];  </div>];
831    push @nav, ['#result-summary' => 'Result'];    push @nav, ['#result-summary' => 'Result'];
832  } # print_Result_input_error_section  } # print_result_input_error_section
833    
834  sub get_error_label ($) {  sub get_error_label ($$) {
835    my $err = shift;    my ($input, $err) = @_;
836    
837    my $r = '';    my $r = '';
838    
# Line 794  sub get_error_label ($) { Line 847  sub get_error_label ($) {
847    
848    if (defined $err->{node}) {    if (defined $err->{node}) {
849      $r .= ' ' if length $r;      $r .= ' ' if length $r;
850      $r = get_node_link ($err->{node});      $r = get_node_link ($input, $err->{node});
851    }    }
852    
853    if (defined $err->{index}) {    if (defined $err->{index}) {
# Line 824  sub get_error_level_label ($) { Line 877  sub get_error_level_label ($) {
877    } elsif ($err->{level} eq 'w') {    } elsif ($err->{level} eq 'w') {
878      $r = qq[<strong><a href="../error-description#level-w">Warning</a></strong>:      $r = qq[<strong><a href="../error-description#level-w">Warning</a></strong>:
879          ];          ];
880    } elsif ($err->{level} eq 'unsupported') {    } elsif ($err->{level} eq 'u' or $err->{level} eq 'unsupported') {
881      $r = qq[<strong><a href="../error-description#level-u">Not      $r = qq[<strong><a href="../error-description#level-u">Not
882          supported</a></strong>: ];          supported</a></strong>: ];
883    } else {    } else {
# Line 863  sub get_node_path ($) { Line 916  sub get_node_path ($) {
916    return join '/', @r;    return join '/', @r;
917  } # get_node_path  } # get_node_path
918    
919  sub get_node_link ($) {  sub get_node_link ($$) {
920    return qq[<a href="#node-@{[refaddr $_[0]]}">] .    return qq[<a href="#$_[0]->{id_prefix}node-@{[refaddr $_[1]]}">] .
921        htescape (get_node_path ($_[0])) . qq[</a>];        htescape (get_node_path ($_[1])) . qq[</a>];
922  } # get_node_link  } # get_node_link
923    
924  {  {
# Line 873  sub get_node_link ($) { Line 926  sub get_node_link ($) {
926    
927  sub load_text_catalog ($) {  sub load_text_catalog ($) {
928    my $lang = shift; # MUST be a canonical lang name    my $lang = shift; # MUST be a canonical lang name
929    open my $file, '<', "cc-msg.$lang.txt" or die "$0: cc-msg.$lang.txt: $!";    open my $file, '<:utf8', "cc-msg.$lang.txt"
930          or die "$0: cc-msg.$lang.txt: $!";
931    while (<$file>) {    while (<$file>) {
932      if (s/^([^;]+);([^;]*);//) {      if (s/^([^;]+);([^;]*);//) {
933        my ($type, $cls, $msg) = ($1, $2, $_);        my ($type, $cls, $msg) = ($1, $2, $_);
# Line 886  sub load_text_catalog ($) { Line 940  sub load_text_catalog ($) {
940  sub get_text ($) {  sub get_text ($) {
941    my ($type, $level, $node) = @_;    my ($type, $level, $node) = @_;
942    $type = $level . ':' . $type if defined $level;    $type = $level . ':' . $type if defined $level;
943      $level = 'm' unless defined $level;
944    my @arg;    my @arg;
945    {    {
946      if (defined $Msg->{$type}) {      if (defined $Msg->{$type}) {
# Line 910  sub get_text ($) { Line 965  sub get_text ($) {
965            ? htescape ($node->owner_element->manakai_local_name)            ? htescape ($node->owner_element->manakai_local_name)
966            : ''            : ''
967        }ge;        }ge;
968        return ($type, $Msg->{$type}->[0], $msg);        return ($type, 'level-' . $level . ' ' . $Msg->{$type}->[0], $msg);
969      } elsif ($type =~ s/:([^:]*)$//) {      } elsif ($type =~ s/:([^:]*)$//) {
970        unshift @arg, $1;        unshift @arg, $1;
971        redo;        redo;
972      }      }
973    }    }
974    return ($type, '', htescape ($_[0]));    return ($type, 'level-'.$level, htescape ($_[0]));
975  } # get_text  } # get_text
976    
977  }  }
# Line 972  EOH Line 1027  EOH
1027      $ua->protocols_allowed ([qw/http/]);      $ua->protocols_allowed ([qw/http/]);
1028      $ua->max_size (1000_000);      $ua->max_size (1000_000);
1029      my $req = HTTP::Request->new (GET => $request_uri);      my $req = HTTP::Request->new (GET => $request_uri);
1030        $req->header ('Accept-Encoding' => 'identity, *; q=0');
1031      my $res = $ua->request ($req);      my $res = $ua->request ($req);
1032      ## TODO: 401 sets |is_success| true.      ## TODO: 401 sets |is_success| true.
1033      if ($res->is_success or $http->get_parameter ('error-page')) {      if ($res->is_success or $http->get_parameter ('error-page')) {
# Line 981  EOH Line 1037  EOH
1037    
1038        ## TODO: More strict parsing...        ## TODO: More strict parsing...
1039        my $ct = $res->header ('Content-Type');        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;  
       }  
1040        if (defined $ct and $ct =~ /;\s*charset\s*=\s*"?([^\s;"]+)"?/i) {        if (defined $ct and $ct =~ /;\s*charset\s*=\s*"?([^\s;"]+)"?/i) {
1041          $r->{charset} = lc $1;          $r->{charset} = lc $1;
1042          $r->{charset} =~ tr/\\//d;          $r->{charset} =~ tr/\\//d;
1043            $r->{official_charset} = $r->{charset};
1044        }        }
1045    
1046        my $input_charset = $http->get_parameter ('charset');        my $input_charset = $http->get_parameter ('charset');
# Line 994  EOH Line 1048  EOH
1048          $r->{charset_overridden}          $r->{charset_overridden}
1049              = (not defined $r->{charset} or $r->{charset} ne $input_charset);              = (not defined $r->{charset} or $r->{charset} ne $input_charset);
1050          $r->{charset} = $input_charset;          $r->{charset} = $input_charset;
1051        }        }
1052    
1053          ## TODO: Support for HTTP Content-Encoding
1054    
1055        $r->{s} = ''.$res->content;        $r->{s} = ''.$res->content;
1056    
1057          require Whatpm::ContentType;
1058          ($r->{official_type}, $r->{media_type})
1059              = Whatpm::ContentType->get_sniffed_type
1060                  (get_file_head => sub {
1061                     return substr $r->{s}, 0, shift;
1062                   },
1063                   http_content_type_byte => $ct,
1064                   has_http_content_encoding =>
1065                       defined $res->header ('Content-Encoding'),
1066                   supported_image_types => {});
1067      } else {      } else {
1068        $r->{uri} = $res->request->uri;        $r->{uri} = $res->request->uri;
1069        $r->{request_uri} = $request_uri;        $r->{request_uri} = $request_uri;
# Line 1017  EOH Line 1084  EOH
1084      $r->{charset} = ''.$http->get_parameter ('_charset_');      $r->{charset} = ''.$http->get_parameter ('_charset_');
1085      $r->{charset} =~ s/\s+//g;      $r->{charset} =~ s/\s+//g;
1086      $r->{charset} = 'utf-8' if $r->{charset} eq '';      $r->{charset} = 'utf-8' if $r->{charset} eq '';
1087        $r->{official_charset} = $r->{charset};
1088      $r->{header_field} = [];      $r->{header_field} = [];
1089    
1090        require Whatpm::ContentType;
1091        ($r->{official_type}, $r->{media_type})
1092            = Whatpm::ContentType->get_sniffed_type
1093                (get_file_head => sub {
1094                   return substr $r->{s}, 0, shift;
1095                 },
1096                 http_content_type_byte => undef,
1097                 has_http_content_encoding => 0,
1098                 supported_image_types => {});
1099    }    }
1100    
1101    my $input_format = $http->get_parameter ('i');    my $input_format = $http->get_parameter ('i');
# Line 1034  EOH Line 1112  EOH
1112    if ($r->{media_type} eq 'text/xml') {    if ($r->{media_type} eq 'text/xml') {
1113      unless (defined $r->{charset}) {      unless (defined $r->{charset}) {
1114        $r->{charset} = 'us-ascii';        $r->{charset} = 'us-ascii';
1115          $r->{official_charset} = $r->{charset};
1116      } elsif ($r->{charset_overridden} and $r->{charset} eq 'us-ascii') {      } elsif ($r->{charset_overridden} and $r->{charset} eq 'us-ascii') {
1117        $r->{charset_overridden} = 0;        $r->{charset_overridden} = 0;
1118      }      }
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.32
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24