validator/share/templates/en_US earl_n3.tmpl,1.2,1.3 earl_xml.tmpl,1.2,1.3 header.tmpl,1.33,1.34 soap_fault.tmpl,1.3,1.4 soap_output.tmpl,1.11,1.12 ucn_output.tmpl,1.7,1.8 xml_output.tmpl,1.4,1.5

Update of /sources/public/validator/share/templates/en_US
In directory hutz:/tmp/cvs-serv1598/share/templates/en_US

Modified Files:
	earl_n3.tmpl earl_xml.tmpl header.tmpl soap_fault.tmpl 
	soap_output.tmpl ucn_output.tmpl xml_output.tmpl 
Log Message:
making the     X-W3C-Validator-Status header more consistently report:
* Valid if validation passed
* Invalid if validation proceeded, failed
* Abort if validation could not be performed



Index: earl_xml.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/earl_xml.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- earl_xml.tmpl	2 Nov 2006 03:16:57 -0000	1.2
+++ earl_xml.tmpl	9 Jul 2007 04:56:27 -0000	1.3
@@ -1,7 +1,8 @@
 Content-Type: application/rdf+xml; charset=UTF-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="valid_status">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
+X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
 X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
 
 <?xml version="1.0" encoding="UTF-8"?>
 <rdf:RDF

Index: header.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/header.tmpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- header.tmpl	31 May 2007 02:32:14 -0000	1.33
+++ header.tmpl	9 Jul 2007 04:56:27 -0000	1.34
@@ -1,8 +1,9 @@
 Content-Language: en
 Content-Type: text/html; charset=utf-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="valid_status">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
+X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
 X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
 
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

Index: xml_output.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/xml_output.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xml_output.tmpl	9 Jul 2007 03:46:01 -0000	1.4
+++ xml_output.tmpl	9 Jul 2007 04:56:27 -0000	1.5
@@ -1,7 +1,8 @@
 Content-Type: application/xml; charset=UTF-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="valid_status">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
+X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
 X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
 
 <?xml version="1.0" encoding="UTF-8"?>
 <!--

Index: soap_fault.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/soap_fault.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- soap_fault.tmpl	2 Nov 2006 03:16:57 -0000	1.3
+++ soap_fault.tmpl	9 Jul 2007 04:56:27 -0000	1.4
@@ -1,7 +1,8 @@
 Content-Type: application/soap+xml; charset=UTF-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="valid_status">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
+X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
 X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
 
 <?xml version='1.0' encoding="utf-8"?>
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"

Index: ucn_output.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/ucn_output.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ucn_output.tmpl	9 Jul 2007 03:46:01 -0000	1.7
+++ ucn_output.tmpl	9 Jul 2007 04:56:27 -0000	1.8
@@ -1,7 +1,8 @@
 Content-Type: application/xml; charset=UTF-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="valid_status">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
+X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
 X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
 
 <?xml version="1.0" encoding="UTF-8"?>
 <observationresponse xmlns="http://www.w3.org/unicorn/observationresponse"

Index: soap_output.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/soap_output.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- soap_output.tmpl	28 Jun 2007 06:01:51 -0000	1.11
+++ soap_output.tmpl	9 Jul 2007 04:56:27 -0000	1.12
@@ -1,7 +1,8 @@
 Content-Type: application/soap+xml; charset=UTF-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="valid_status">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
+X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
 X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
 
 <?xml version="1.0" encoding="UTF-8"?>
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">

Index: earl_n3.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/earl_n3.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- earl_n3.tmpl	2 Nov 2006 03:16:57 -0000	1.2
+++ earl_n3.tmpl	9 Jul 2007 04:56:27 -0000	1.3
@@ -1,7 +1,8 @@
 Content-Type: text/plain; charset=UTF-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="valid_status">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
+X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
 X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
 
 @prefix earl: <http://www.w3.org/2001/03/earl/1.0-test#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

Received on Monday, 9 July 2007 04:56:35 UTC