--- test/html-webhacc/WebHACC/Output.pm 2008/07/21 05:24:32 1.3 +++ test/html-webhacc/WebHACC/Output.pm 2008/08/15 05:53:23 1.16 @@ -16,8 +16,19 @@ return $s; }; +my $htescape_value = sub ($) { + my $s = $_[0]; + $s =~ s/&/&/g; + $s =~ s//>/g; + $s =~ s/"/"/g; + return $s; +}; + sub new ($) { - return bless {nav => []}, shift; + require WebHACC::Input; + return bless {nav => [], section_rank => 1, + input => WebHACC::Input->new}, shift; } # new sub input ($;$) { @@ -25,7 +36,7 @@ if (defined $_[1]) { $_[0]->{input} = $_[1]; } else { - delete $_[0]->{input}; + $_[0]->{input} = WebHACC::Input->new; } } @@ -44,6 +55,18 @@ return $_[0]->{handle}; } # handle +sub has_error ($;$) { + if (@_ > 1) { + if (defined $_[1]) { + $_[0]->{has_error} = 1; + } else { + delete $_[0]->{has_error}; + } + } + + return $_[0]->{has_error}; +} # has_error + sub set_utf8 ($) { binmode shift->{handle}, ':utf8'; } # set_utf8 @@ -73,40 +96,180 @@ sub start_tag ($$%) { my ($self, $tag_name, %opt) = @_; - $self->html ('<' . $htescape->($tag_name)); # escape for safety + $self->html ('<' . $htescape_value->($tag_name)); # escape for safety if (exists $opt{id}) { my $id = $self->input->id_prefix . $opt{id}; - $self->html (' id="' . $htescape->($id) . '"'); + $self->html (' id="' . $htescape_value->($id) . '"'); delete $opt{id}; } for (keys %opt) { # for safety - $self->html (' ' . $htescape->($_) . '="' . $htescape->($opt{$_}) . '"'); + $self->html (' ' . $htescape_value->($_) . '="' . + $htescape_value->($opt{$_}) . '"'); } $self->html ('>'); } # start_tag sub end_tag ($$) { - shift->html ('(shift) . '>'); + shift->html ('(shift) . '>'); } # end_tag sub start_section ($%) { my ($self, %opt) = @_; - $self->html ('
{section_rank}++; + $self->html (qq[
input->id_prefix . $opt{id}; - $self->html (' id="' . $htescape->($id) . '"'); - push @{$self->{nav}}, [$id => $opt{short_title} || $opt{title}] - unless $self->input->nested; + my $prefix = $self->input->id_prefix; + $opt{parent_id} ||= $prefix; + my $id = $prefix . $opt{id}; + $self->html (' id="' . $htescape->($id) . '">'); + if ($self->{section_rank} == 2 or length $opt{parent_id}) { + my $st = $opt{short_title} || $opt{title}; + push @{$self->{nav}}, + [$id => $st => $opt{text}]; + + $self->start_tag ('script'); + $self->html (qq[ addSectionLink ('$id', ']); + $self->nl_text ($st, text => $opt{text}); + if (defined $opt{parent_id}) { + $self->html (q[', '] . $opt{parent_id}); + } + $self->html (q[') ]); + $self->end_tag ('script'); + } + } else { + $self->html ('>'); } - $self->html ('>

' . $htescape->($opt{title}) . '

'); + my $section_rank = $self->{section_rank}; + $section_rank = 6 if $section_rank > 6; + $self->html (''); + $self->nl_text ($opt{title}, text => $opt{text}); + $self->html (''); } # start_section sub end_section ($) { my $self = shift; $self->html ('
'); $self->{handle}->flush; + $self->{section_rank}--; } # end_section +sub start_error_list ($%) { + my ($self, %opt) = @_; + + if (defined $opt{role}) { + if ($opt{role} eq 'parse-errors') { + $opt{id} ||= 'parse-errors-list'; + delete $opt{role}; + } elsif ($opt{role} eq 'structure-errors') { + $opt{id} ||= 'document-errors-list'; + delete $opt{role}; + } elsif ($opt{role} eq 'transfer-errors') { + $opt{id} ||= 'transfer-errors-list'; + delete $opt{role}; + } + } + + $self->start_tag ('dl', %opt); + + delete $self->{has_error}; # reset +} # start_error_list + +sub end_error_list ($%) { + my ($self, %opt) = @_; + + my $no_error_message = 'No error found.'; + + if (defined $opt{role}) { + if ($opt{role} eq 'parse-errors') { + $self->end_tag ('dl'); + ## NOTE: For parse error list, the |add_source_to_parse_error_list| + ## method is invoked at the end of |generate_source_string_section|, + ## since that generation method is invoked after the error list + ## is generated. + $no_error_message = 'No parse error found.'; + } elsif ($opt{role} eq 'structure-errors') { + $self->end_tag ('dl'); + $self->add_source_to_parse_error_list ('document-errors-list'); + $no_error_message = 'No structural error found.'; + } elsif ($opt{role} eq 'transfer-errors') { + $self->end_tag ('dl'); + $no_error_message = 'No transfer error found.'; + } else { + $self->end_tag ('dl'); + } + } else { + $self->end_tag ('dl'); + } + + unless ($self->{has_error}) { + $self->start_tag ('p', class => 'no-errors'); + $self->nl_text ($no_error_message); + } +} # end_error_list + +sub add_source_to_parse_error_list ($$) { + my $self = shift; + + $self->script (q[addSourceToParseErrorList ('] . $self->input->id_prefix . + q[', '] . shift () . q[')]); +} # add_source_to_parse_error_list + sub start_code_block ($) { shift->html ('
');
 } # start_code_block
@@ -132,9 +295,38 @@
 sub dt ($$;%) {
   my ($self, $content, %opt) = @_;
   $self->start_tag ('dt', %opt);
-  $self->text ($content);
+  $self->nl_text ($content, text => $opt{text});
 } # dt
 
+sub select ($$%) {
+  my ($self, $options, %opt) = @_;
+
+  my $selected = $opt{selected};
+  delete $opt{selected};
+
+  $self->start_tag ('select', %opt);
+  
+  my @options = @$options;
+  while (@options) {
+    my $opt = shift @options;
+    if ($opt->{options}) {
+      $self->html ('');
+      unshift @options, @{$opt->{options}}, {end_options => 1};
+    } elsif ($opt->{end_options}) {
+      $self->end_tag ('optgroup');
+    } else {
+      $self->start_tag ('option', value => $opt->{value},
+                        ((defined $selected and $opt->{value} eq $selected)
+                             ? (selected => '') : ()));
+      $self->nl_text (defined $opt->{label} ? $opt->{label} : $opt->{value});
+    }
+  }
+
+  $self->end_tag ('select');
+} # select
+
 sub link ($$%) {
   my ($self, $content, %opt) = @_;
   $self->start_tag ('a', %opt, href => $opt{url});
@@ -145,7 +337,7 @@
 sub xref ($$%) {
   my ($self, $content, %opt) = @_;
   $self->html ('');
-  $self->text ($content);
+  $self->nl_text ($content, text => $opt{text});
   $self->html ('');
 } # xref
 
@@ -155,7 +347,6 @@
   $self->link ($content, %opt);
 } # link_to_webhacc
 
-
 my $get_node_path = sub ($) {
   my $node = shift;
   my @r;
@@ -183,20 +374,303 @@
   return join '/', @r;
 }; # $get_node_path
 
+my $get_object_path = sub ($) {
+  my $node = shift;
+  my @r;
+  while (defined $node) {
+    my $ref = ref $node;
+    $ref =~ /([^:]+)$/;
+    my $rs = $1;
+    my $node_name = $node->node_name;
+    if (defined $node_name) {
+      $rs .= ' ' . $htescape->($node_name) . '';
+    }
+    $node = undef;
+    unshift @r, $rs;
+  }
+  return join '/', @r;
+}; # $get_object_path
+
 sub node_link ($$) {
   my ($self, $node) = @_;
-  $self->xref ($get_node_path->($node), target => 'node-' . refaddr $node);
+  if ($node->isa ('Message::IF::Node')) {
+    $self->xref ($get_node_path->($node), target => 'node-' . refaddr $node);
+  } else {
+    $self->html ($get_object_path->($node));
+  }
 } # node_link
 
+{
+  my $Msg = {};
+
+sub load_text_catalog ($$) {
+  my $self = shift;
+
+  my $lang = shift; # MUST be a canonical lang name
+  my $file_name = qq[cc-msg.$lang.txt];
+  $lang = 'en' unless -f $file_name;
+  $self->{primary_language} = $lang;
+  
+  open my $file, '<:utf8', $file_name or die "$0: $file_name: $!";
+  while (<$file>) {
+    if (s/^([^;]+);([^;]*);//) {
+      my ($type, $cls, $msg) = ($1, $2, $_);
+      $msg =~ tr/\x0D\x0A//d;
+      $Msg->{$type} = [$cls, $msg];
+    }
+  }
+} # load_text_catalog
+
+sub nl_text ($$;%) {
+  my ($self, $type, %opt) = @_;
+  my $node = $opt{node};
+
+  my @arg;
+  {
+    if (defined $Msg->{$type}) {
+      my $msg = $Msg->{$type}->[1];
+      if ($msg =~ //) {
+        $msg =~ s{\$([0-9]+)}{
+          defined $arg[$1] ? $htescape->($arg[$1]) : '(undef)';
+        }ge;
+        $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) : ''
+        }ge;
+        $msg =~ s{{text}}{
+          defined $opt{text} ? $htescape->($opt{text}) : ''
+        }ge;
+        $msg =~ s{{local-name}}{
+          UNIVERSAL::can ($node, 'manakai_local_name')
+            ? $htescape->($node->manakai_local_name) : ''
+        }ge;
+        $msg =~ s{{element-local-name}}{
+          (UNIVERSAL::can ($node, 'owner_element') and
+           $node->owner_element)
+            ? $htescape->($node->owner_element->manakai_local_name) : ''
+        }ge;
+      }
+      $self->html ($msg);
+      return;
+    } elsif ($type =~ s/:([^:]*)$//) {
+      unshift @arg, $1;
+      redo;
+    }
+  }
+  $self->text ($type);
+} # nl_text
+
+}
+
 sub nav_list ($) {
   my $self = shift;
   $self->html (q[');
 } # nav_list
 
+sub http_header ($) {
+  shift->html (qq[Content-Type: text/html; charset=utf-8\n\n]);
+} # http_header
+
+sub http_error ($$) {
+  my $self = shift;
+  my $code = 0+shift;
+  my $text = {
+    404 => 'Not Found',
+  }->{$code};
+  $self->html (qq[Status: $code $text\nContent-Type: text/html ; charset=us-ascii\n\n$code $text]);
+} # http_error
+
+sub html_header ($) {
+  my $self = shift;
+  $self->html (q[]);
+  $self->start_tag ('html', lang => $self->{primary_language});
+  $self->html (q[]);
+  $self->nl_text (q[WebHACC:Title]);
+  $self->html (q[
+
+
+
+
+

]); + $self->nl_text (q[WebHACC:Heading]); + $self->html (q[

]); +} # html_header + +sub generate_input_section ($$) { + my ($out, $cgi) = @_; + + require Encode; + my $decode = sub ($) { + if (defined $_[0]) { + return Encode::decode ('utf-8', $_[0]); + } else { + return undef; + } + }; # $decode + + my $options = sub ($) { + my $context = shift; + + $out->html (q[

]); + $out->nl_text (q[Options]); + $out->start_tag ('div'); + + if ($context eq 'url') { + $out->start_tag ('p'); + $out->start_tag ('label'); + $out->start_tag ('input', type => 'checkbox', name => 'error-page', + value => 1, + ($cgi->get_parameter ('error-page') + ? (checked => '') : ())); + $out->nl_text ('Check error page'); + $out->end_tag ('label'); + } + + $out->start_tag ('p'); + $out->start_tag ('label'); + $out->nl_text (q[Content type]); + $out->text (': '); + $out->select ([ + {value => '', label => 'As specified'}, + {value => 'application/atom+xml'}, + {value => 'application/xhtml+xml'}, + {value => 'application/xml'}, + {value => 'text/html'}, + {value => 'text/xml'}, + {value => 'text/css'}, + {value => 'text/cache-manifest'}, + {value => 'text/x-webidl'}, + ], name => 'i', selected => scalar $cgi->get_parameter ('i')); + $out->end_tag ('label'); + + if ($context ne 'text') { + $out->start_tag ('p'); + $out->start_tag ('label'); + $out->nl_text (q[Charset]); + $out->text (q[: ]); + $out->select ([ + {value => '', label => 'As specified'}, + {label => 'Japanese charsets', options => [ + {value => 'Windows-31J'}, + {value => 'Shift_JIS'}, + {value => 'EUC-JP'}, + {value => 'ISO-2022-JP'}, + ]}, + {label => 'European charsets', options => [ + {value => 'Windows-1252'}, + {value => 'ISO-8859-1'}, + {value => 'US-ASCII'}, + ]}, + {label => 'Asian charsets', options => [ + {value => 'Windows-874'}, + {value => 'ISO-8859-11'}, + {value => 'TIS-620'}, + ]}, + {label => 'Unicode charsets', options => [ + {value => 'UTF-8'}, + {value => 'UTF-8n'}, + ]}, + ], name => 'charset', + selected => scalar $cgi->get_parameter ('charset')); + $out->end_tag ('label'); + } + + if ($context eq 'text') { + $out->start_tag ('p'); + $out->start_tag ('label'); + $out->nl_text ('Setting innerHTML'); + $out->text (': '); + $out->start_tag ('input', name => 'e', + value => $decode->(scalar $cgi->get_parameter ('e'))); + $out->end_tag ('label'); + } + + $out->html (q[

]); + }; # $options + + $out->start_section (id => 'input', title => 'Input'); + $out->html (q[]); + + $out->start_section (id => 'input-url', title => 'By URL', + parent_id => 'input'); + $out->start_tag ('form', action => './#result-summary', + 'accept-charset' => 'utf-8', + method => 'get'); + $out->start_tag ('input', type => 'hidden', name => '_charset_'); + + $out->start_tag ('p'); + $out->start_tag ('label'); + $out->nl_text ('URL'); + $out->text (': '); + $out->start_tag ('input', + name => 'uri', + type => 'url', + value => $decode->(scalar $cgi->get_parameter ('uri'))); + $out->end_tag ('label'); + + $out->start_tag ('p'); + $out->start_tag ('button', type => 'submit'); + $out->nl_text ('Check'); + $out->end_tag ('button'); + + $options->('url'); + + $out->end_tag ('form'); + $out->end_section; + + $out->end_tag ('fieldset'); + + ## TODO: File upload + + $out->start_section (id => 'input-text', title => 'By direct input', + parent_id => 'input'); + $out->start_tag ('form', action => './#result-summary', + 'accept-charset' => 'utf-8', + method => 'post'); + $out->start_tag ('input', type => 'hidden', name => '_charset_'); + + $out->start_tag ('p'); + $out->start_tag ('label'); + $out->nl_text ('Document source to check'); + $out->text (': '); + $out->start_tag ('br'); + $out->start_tag ('textarea', + name => 's'); + my $s = $decode->($cgi->get_parameter ('s')); + $out->html ($htescape_value->($s)) if defined $s; + $out->end_tag ('textarea'); + $out->end_tag ('label'); + + $out->start_tag ('p'); + $out->start_tag ('button', type => 'submit', + onclick => 'form.method = form.s.value.length > 512 ? "post" : "get"'); + $out->nl_text ('Check'); + $out->end_tag ('button'); + + $options->('text'); + + $out->end_tag ('form'); + $out->end_section; + + $out->script (q[ + if (!document.webhaccNavigated && + document.getElementsByTagName ('textarea')[0].value.length > 0) { + showTab ('input-text'); + document.webhaccNavigated = false; + } + ]); + + $out->end_section; +} # generate_input_section sub encode_url_component ($$) { shift;