- From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 19 Aug 2008 13:49:26 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv14084
Modified Files:
check
Log Message:
using message explanation from upstream parser, if it exists
Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.598
retrieving revision 1.599
diff -u -d -r1.598 -r1.599
--- check 19 Aug 2008 13:20:24 -0000 1.598
+++ check 19 Aug 2008 13:49:23 -0000 1.599
@@ -871,7 +871,7 @@
foreach my $message_node (@message_nodes) {
my $message_type = $message_node->localname;
my $err;
- my ($html5_error_line, $html5_error_col, $html5_error_msg);
+ my ($html5_error_line, $html5_error_col, $html5_error_msg, $html5_error_expl);
if ($message_type eq "error") {
$err->{type} = "E";
$File->{'Is Valid'} = FALSE;
@@ -903,6 +903,11 @@
$html5_error_msg = $child_node->toString();
$html5_error_msg =~ s,</?message>,,gi;
}
+ if ($child_node->localname eq "elaboration") {
+ $html5_error_expl = $child_node->toString();
+ $html5_error_expl =~ s,</?elaboration>,,gi;
+ $html5_error_expl = "\n<div class=\"ve html5\">$html5_error_expl</div>\n";
+ }
}
# formatting the error message for output
$err->{src} = '...'; # do this with show_open_entities()?
@@ -910,6 +915,7 @@
$err->{char} = $html5_error_col;
$err->{num} = 'html5';
$err->{msg} = $html5_error_msg;
+ $err->{expl} = $html5_error_expl;
push @{$File->{Errors}}, $err;
# @@ TODO message explanation / elaboration
}
@@ -1874,37 +1880,34 @@
$col = 0;
}
my $explanation = "";
- if ($err->{num}) {
- my $num = $err->{num};
-
-# if (exists $Msgs{$num}) { # We've already seen this message...
-# if ($File->{Opt}->{Verbose}) { # ...so only repeat it in Verbose mode.
-# $explanation = qq(\n <div class="hidden mid-$num"></div>\n);
-# }
-# } else {
-# $Msgs{$num} = 1;
+ if ($err->{expl}) {
+
+ }
+ else {
+ if ($err->{num}) {
+ my $num = $err->{num};
$explanation .= Encode::decode_utf8("\n $RSRC->{msg}->{$num}->{verbose}\n")
if exists $RSRC->{msg}->{$num}
&& exists $RSRC->{msg}->{$num}->{verbose};
-# }
- my $_msg = $RSRC->{msg}->{nomsg}->{verbose};
- $_msg =~ s/<!--MID-->/$num/g;
- if (($File->{'Is Upload'}) or ($File->{'Direct Input'}))
- {
- $_msg =~ s/<!--URI-->//g
- }
- else
- {
- my $escaped_uri = uri_escape($File->{URI});
- $_msg =~ s/<!--URI-->/$escaped_uri/g;
+ my $_msg = $RSRC->{msg}->{nomsg}->{verbose};
+ $_msg =~ s/<!--MID-->/$num/g;
+ if (($File->{'Is Upload'}) or ($File->{'Direct Input'}))
+ {
+ $_msg =~ s/<!--URI-->//g
+ }
+ else
+ {
+ my $escaped_uri = uri_escape($File->{URI});
+ $_msg =~ s/<!--URI-->/$escaped_uri/g;
+ }
+ $explanation = " $_msg\n$explanation"; # The send feedback plea.
+ $explanation =~ s/<!--CFG_HOME_PAGE-->/$CFG->{'Home Page'}/g;
}
- $explanation = " $_msg\n$explanation"; # The send feedback plea.
- $explanation =~ s/<!--CFG_HOME_PAGE-->/$CFG->{'Home Page'}/g;
+ $err->{expl} = $explanation;
}
-
+
$err->{src} = $line;
$err->{col} = ' ' x $col;
- $err->{expl} = $explanation;
if ($err->{type} eq 'I')
{
$err->{class} = 'msg_info';
Received on Tuesday, 19 August 2008 13:49:59 UTC