--- test/html-webhacc/cc.cgi 2007/07/17 14:28:20 1.14 +++ test/html-webhacc/cc.cgi 2007/07/21 04:58:17 1.15 @@ -194,7 +194,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[ [Description]]; @@ -279,7 +279,7 @@
]; for my $id (sort {$a cmp $b} keys %{$elements->{id}}) { - print STDOUT qq[
@{[htescape $id]}
]; + print STDOUT qq[
@{[htescape $id]}
]; for (@{$elements->{id}->{$id}}) { print STDOUT qq[
].get_node_link ($_).qq[
]; } @@ -313,7 +313,7 @@
]; for my $class (sort {$a cmp $b} keys %{$elements->{class}}) { - print STDOUT qq[
@{[htescape $class]}
]; + print STDOUT qq[
@{[htescape $class]}
]; for (@{$elements->{class}->{$class}}) { print STDOUT qq[
].get_node_link ($_).qq[
]; } @@ -534,7 +534,7 @@ } # load_text_catalog sub get_text ($) { - my ($type, $level) = @_; + my ($type, $level, $node) = @_; $type = $level . ':' . $type if defined $level; my @arg; { @@ -543,6 +543,13 @@ $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; return ($type, $Msg->{$type}->[0], $msg); } elsif ($type =~ s/:([^:]*)$//) { unshift @arg, $1; @@ -716,4 +723,4 @@ =cut -## $Date: 2007/07/17 14:28:20 $ +## $Date: 2007/07/21 04:58:17 $