--- test/html-webhacc/cc.cgi	2007/07/17 14:28:20	1.14
+++ test/html-webhacc/cc.cgi	2007/09/02 07:59:01	1.17
@@ -2,12 +2,10 @@
 use strict;
 
 use lib qw[/home/httpd/html/www/markup/html/whatpm
-           /home/wakaba/work/manakai/lib
-           /home/wakaba/public_html/-temp/wiki/lib];
+           /home/wakaba/work/manakai2/lib];
 use CGI::Carp qw[fatalsToBrowser];
 use Scalar::Util qw[refaddr];
-
-use SuikaWiki::Input::HTTP; ## TODO: Use some better CGI module
+use Time::HiRes qw/time/;
 
 sub htescape ($) {
   my $s = $_[0];
@@ -21,11 +19,10 @@
   return $s;
 } # htescape
 
-my $http = SuikaWiki::Input::HTTP->new;
-
-## TODO: _charset_
+  use Message::CGI::HTTP;
+  my $http = Message::CGI::HTTP->new;
 
-  if ($http->meta_variable ('PATH_INFO') ne '/') {
+  if ($http->get_meta_variable ('PATH_INFO') ne '/') {
     print STDOUT "Status: 404 Not Found\nContent-Type: text/plain; charset=us-ascii\n\n400";
     exit;
   }
@@ -54,7 +51,11 @@
 
   $| = 0;
   my $input = get_input_document ($http, $dom);
-  my $inner_html_element = $http->parameter ('e');
+  my $inner_html_element = $http->get_parameter ('e');
+  my $char_length = 0;
+  my %time;
+  my $time1;
+  my $time2;
 
   print qq[
 <div id="document-info" class="section">
@@ -67,6 +68,7 @@
   push @nav, ['#document-info' => 'Information'];
 
 if (defined $input->{s}) {
+  $char_length = length $input->{s};
 
   print STDOUT qq[
 <dt>Base URI</dt>
@@ -77,6 +79,8 @@
 <dt>Character Encoding</dt>
     <dd>@{[defined $input->{charset} ? '<code class="charset" lang="en">'.htescape ($input->{charset}).'</code>' : '(none)']}
     @{[$input->{charset_overridden} ? '<em>(overridden)</em>' : '']}</dd>
+<dt>Length</dt>
+    <dd>$char_length byte@{[$char_length == 1 ? '' : 's']}</dd>
 </dl>
 </div>
 ];
@@ -91,8 +95,11 @@
     require Whatpm::HTML;
 
     $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now.
-    
+
+    $time1 = time;
     my $t = Encode::decode ($input->{charset}, $input->{s});
+    $time2 = time;
+    $time{decode} = $time2 - $time1;
 
     print STDOUT qq[
 <div id="parse-errors" class="section">
@@ -117,6 +124,7 @@
   };
 
   $doc = $dom->create_document;
+  $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]);
@@ -124,6 +132,8 @@
   } else {
     Whatpm::HTML->parse_string ($t => $doc, $onerror);
   }
+  $time2 = time;
+  $time{parse} = $time2 - $time1;
 
   print STDOUT qq[</dl>
 </div>
@@ -132,6 +142,9 @@
     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}}) {
@@ -153,9 +166,12 @@
     return 1;
   };
 
+  $time1 = time;
   open my $fh, '<', \($input->{s});
   $doc = Message::DOM::XMLParserTemp->parse_byte_stream
       ($fh => $dom, $onerror, charset => $input->{charset});
+  $time2 = time;
+  $time{parse_xml} = $time2 - $time1;
 
     print STDOUT qq[</dl>
 </div>
@@ -194,7 +210,7 @@
     require Whatpm::ContentChecker;
     my $onerror = sub {
       my %opt = @_;
-      my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
+      my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}, $opt{node});
       $type =~ tr/ /-/;
       $type =~ s/\|/%7C/g;
       $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
@@ -202,12 +218,15 @@
           qq[</dt>\n<dd class="$cls">], $msg, "</dd>\n";
     };
 
+    $time1 = time;
     my $elements;
     if ($el) {
       $elements = Whatpm::ContentChecker->check_element ($el, $onerror);
     } else {
       $elements = Whatpm::ContentChecker->check_document ($doc, $onerror);
     }
+    $time2 = time;
+    $time{check} = $time2 - $time1;
 
     print STDOUT qq[</dl>
 </div>
@@ -279,7 +298,7 @@
 <dl>
 ];
       for my $id (sort {$a cmp $b} keys %{$elements->{id}}) {
-        print STDOUT qq[<dt>@{[htescape $id]}</dt>];
+        print STDOUT qq[<dt><code>@{[htescape $id]}</code></dt>];
         for (@{$elements->{id}->{$id}}) {
           print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];
         }
@@ -313,7 +332,7 @@
 <dl>
 ];
       for my $class (sort {$a cmp $b} keys %{$elements->{class}}) {
-        print STDOUT qq[<dt>@{[htescape $class]}</dt>];
+        print STDOUT qq[<dt><code>@{[htescape $class]}</code></dt>];
         for (@{$elements->{class}->{$class}}) {
           print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];
         }
@@ -348,6 +367,12 @@
 </html>
 ];
 
+  for (qw/decode parse parse_xml check/) {
+    next unless defined $time{$_};
+    open my $file, '>>', ".cc-$_.txt" or die ".cc-$_.txt: $!";
+    print $file $char_length, "\t", $time{$_}, "\n";
+  }
+
 exit;
 
 sub print_http_header_section ($) {
@@ -534,7 +559,7 @@
 } # load_text_catalog
 
 sub get_text ($) {
-  my ($type, $level) = @_;
+  my ($type, $level, $node) = @_;
   $type = $level . ':' . $type if defined $level;
   my @arg;
   {
@@ -543,6 +568,23 @@
       $msg =~ s{<var>\$([0-9]+)</var>}{
         defined $arg[$1] ? htescape ($arg[$1]) : '(undef)';
       }ge;
+      $msg =~ s{<var>{\@([A-Za-z0-9:_.-]+)}</var>}{
+        UNIVERSAL::can ($node, 'get_attribute_ns')
+            ? htescape ($node->get_attribute_ns (undef, $1)) : ''
+      }ge;
+      $msg =~ s{<var>{\@}</var>}{
+        UNIVERSAL::can ($node, 'value') ? htescape ($node->value) : ''
+      }ge;
+      $msg =~ s{<var>{local-name}</var>}{
+        UNIVERSAL::can ($node, 'manakai_local_name')
+          ? htescape ($node->manakai_local_name) : ''
+      }ge;
+      $msg =~ s{<var>{element-local-name}</var>}{
+        (UNIVERSAL::can ($node, 'owner_element') and
+         $node->owner_element)
+          ? htescape ($node->owner_element->manakai_local_name)
+          : ''
+      }ge;
       return ($type, $Msg->{$type}->[0], $msg);
     } elsif ($type =~ s/:([^:]*)$//) {
       unshift @arg, $1;
@@ -557,7 +599,7 @@
 sub get_input_document ($$) {
   my ($http, $dom) = @_;
 
-  my $request_uri = $http->parameter ('uri');
+  my $request_uri = $http->get_parameter ('uri');
   my $r = {};
   if (defined $request_uri and length $request_uri) {
     my $uri = $dom->create_uri_reference ($request_uri);
@@ -606,7 +648,8 @@
     $ua->max_size (1000_000);
     my $req = HTTP::Request->new (GET => $request_uri);
     my $res = $ua->request ($req);
-    if ($res->is_success or $http->parameter ('error-page')) {
+    ## TODO: 401 sets |is_success| true.
+    if ($res->is_success or $http->get_parameter ('error-page')) {
       $r->{base_uri} = $res->base; ## NOTE: It does check |Content-Base|, |Content-Location|, and <base>. ## TODO: Use our own code!
       $r->{uri} = $res->request->uri;
       $r->{request_uri} = $request_uri;
@@ -621,7 +664,7 @@
         $r->{charset} =~ tr/\\//d;
       }
 
-      my $input_charset = $http->parameter ('charset');
+      my $input_charset = $http->get_parameter ('charset');
       if (defined $input_charset and length $input_charset) {
         $r->{charset_overridden}
             = (not defined $r->{charset} or $r->{charset} ne $input_charset);
@@ -642,17 +685,17 @@
     $r->{header_status_code} = $res->code;
     $r->{header_status_text} = $res->message;
   } else {
-    $r->{s} = ''.$http->parameter ('s');
+    $r->{s} = ''.$http->get_parameter ('s');
     $r->{uri} = q<thismessage:/>;
     $r->{request_uri} = q<thismessage:/>;
     $r->{base_uri} = q<thismessage:/>;
-    $r->{charset} = ''.$http->parameter ('_charset_');
+    $r->{charset} = ''.$http->get_parameter ('_charset_');
     $r->{charset} =~ s/\s+//g;
     $r->{charset} = 'utf-8' if $r->{charset} eq '';
     $r->{header_field} = [];
   }
 
-  my $input_format = $http->parameter ('i');
+  my $input_format = $http->get_parameter ('i');
   if (defined $input_format and length $input_format) {
     $r->{media_type_overridden}
         = (not defined $r->{media_type} or $input_format ne $r->{media_type});
@@ -716,4 +759,4 @@
 
 =cut
 
-## $Date: 2007/07/17 14:28:20 $
+## $Date: 2007/09/02 07:59:01 $