diff options
| -rwxr-xr-x | httpd/cgi-bin/check | 5 | ||||
| -rw-r--r-- | share/templates/en_US/soap_warnings.tmpl | 4 | ||||
| -rw-r--r-- | share/templates/en_US/ucn_warnings.tmpl | 3 | ||||
| -rw-r--r-- | share/templates/en_US/valid.tmpl | 10 | ||||
| -rw-r--r-- | share/templates/en_US/warnings.tmpl | 18 |
5 files changed, 36 insertions, 4 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index ba2690d..73511cd 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.523 2007-05-20 23:17:28 ot Exp $ +# $Id: check,v 1.524 2007-05-22 06:45:16 ot Exp $ # # Disable buffering on STDOUT! @@ -181,7 +181,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.523 $; + $VERSION = q$Revision: 1.524 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -2383,6 +2383,7 @@ sub W3C::Validator::SAXHandler::error # since parsing was done without validation, result can only be "well-formed" if ($File->{Mode} eq 'XML' and lc($File->{Root}) ne 'html') { $File->{XMLWF_ONLY} = TRUE; + add_warning('W09xml', {}); } return; } diff --git a/share/templates/en_US/soap_warnings.tmpl b/share/templates/en_US/soap_warnings.tmpl index 5512440..685badc 100644 --- a/share/templates/en_US/soap_warnings.tmpl +++ b/share/templates/en_US/soap_warnings.tmpl @@ -33,6 +33,10 @@ <TMPL_IF NAME="W09"> <m:warning><m:message>No DOCTYPE found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</m:message></m:warning> </TMPL_IF> +<TMPL_IF NAME="W09xml"> + <m:warning><m:message>No DOCTYPE found! Checking XML syntax only.</m:message></m:warning> +</TMPL_IF> +Checking XML syntax only <TMPL_IF NAME="W10"> <m:warning><m:message>Unknown Namespace Found</m:message></m:warning> </TMPL_IF> diff --git a/share/templates/en_US/ucn_warnings.tmpl b/share/templates/en_US/ucn_warnings.tmpl index 7d6b1ef..ca33c71 100644 --- a/share/templates/en_US/ucn_warnings.tmpl +++ b/share/templates/en_US/ucn_warnings.tmpl @@ -33,6 +33,9 @@ <TMPL_IF NAME="W09"> <warning><message>No DOCTYPE found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</message></warning> </TMPL_IF> +<TMPL_IF NAME="W09xml"> + <warning><message>No DOCTYPE found! Checking XML syntax only.</message></warning> +</TMPL_IF> <TMPL_IF NAME="W10"> <warning><message>Unknown Namespace Found</message></warning> </TMPL_IF> diff --git a/share/templates/en_US/valid.tmpl b/share/templates/en_US/valid.tmpl index e683f49..ec63314 100644 --- a/share/templates/en_US/valid.tmpl +++ b/share/templates/en_US/valid.tmpl @@ -36,11 +36,17 @@ <TMPL_ELSE> was checked and found to be <TMPL_IF NAME="xmlwf_only">well-formed<TMPL_ELSE>valid</TMPL_IF> - <TMPL_VAR NAME="file_version" ESCAPE="HTML">. This means that the - resource in question identified itself as + <TMPL_VAR NAME="file_version" ESCAPE="HTML">. + <TMPL_IF NAME="xmlwf_only">This means that we were not able to determine + the exact document type, but that the document passed the XML well-formedness + syntax check. If you wish to wish to perform formal validation of the document, + you can use the "Document Type:" option of the validator. + <TMPL_ELSE> + This means that the resource in question identified itself as "<TMPL_VAR NAME="file_version" ESCAPE="HTML">" and that we successfully performed a formal validation using an SGML or XML Parser (depending on the markup language used). + </TMPL_IF> </TMPL_IF> </p> <TMPL_IF NAME="have_badge"> diff --git a/share/templates/en_US/warnings.tmpl b/share/templates/en_US/warnings.tmpl index 3183cac..9184f52 100644 --- a/share/templates/en_US/warnings.tmpl +++ b/share/templates/en_US/warnings.tmpl @@ -237,6 +237,24 @@ </li> </TMPL_IF> +<TMPL_IF NAME="W09xml"> + <li class="msg_warn" id="W09xml"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No <code>DOCTYPE</code> found! Checking XML syntax only.</span> + + <p> + The DOCTYPE Declaration was not recognized or is missing. This + probably means that the Formal Public Identifier contains a spelling + error, or that the Declaration is not using correct syntax, or that + your XML document is not using a DOCTYPE Declaration. + </p> + <p> + Validation of the document has been skipped, and a simple check of the well-formedness + of the XML syntax has been performed instead. + </p> + <p>Learn <a href="docs/help.html#faq-doctype">how to add a doctype to your document</a> + from our <acronym title="Frequently Asked Questions">FAQ</acronym>, or use the validator's + option to validate your XML document against a specific Document Type</p> + </li> +</TMPL_IF> <TMPL_IF NAME="W10"> <li class="msg_warn" id="W10"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Unknown Namespace Found</span> |