7 files changed, 20 insertions, 15 deletions
diff --git a/share/templates/en_US/earl_n3.tmpl b/share/templates/en_US/earl_n3.tmpl
index c3e9507..cab2cdd 100644
--- a/share/templates/en_US/earl_n3.tmpl
+++ b/share/templates/en_US/earl_n3.tmpl
@@ -1,6 +1,7 @@
 Content-Type: text/plain; charset=UTF-8
-X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status">
-X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><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">
 
 @prefix earl: <http://www.w3.org/2001/03/earl/1.0-test#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
diff --git a/share/templates/en_US/earl_xml.tmpl b/share/templates/en_US/earl_xml.tmpl
index c5a9710..2c65590 100644
--- a/share/templates/en_US/earl_xml.tmpl
+++ b/share/templates/en_US/earl_xml.tmpl
@@ -1,6 +1,7 @@
 Content-Type: application/rdf+xml; charset=UTF-8
-X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status">
-X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><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">
 
 <?xml version="1.0" encoding="UTF-8"?>
 <rdf:RDF
diff --git a/share/templates/en_US/header.tmpl b/share/templates/en_US/header.tmpl
index 8453e2f..1f4e6a3 100644
--- a/share/templates/en_US/header.tmpl
+++ b/share/templates/en_US/header.tmpl
@@ -1,9 +1,8 @@
 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-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF><TMPL_IF NAME="number_of_errors">
-X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors"></TMPL_IF>
-Cache-Control: <TMPL_IF NAME="cache_control_value"><TMPL_VAR NAME="cache_control_value"><TMPL_ELSE>no-cache</TMPL_IF>
+X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
+X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
 
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
diff --git a/share/templates/en_US/soap_fault.tmpl b/share/templates/en_US/soap_fault.tmpl
index 3de61d8..e4b4646 100644
--- a/share/templates/en_US/soap_fault.tmpl
+++ b/share/templates/en_US/soap_fault.tmpl
@@ -1,6 +1,7 @@
 Content-Type: application/soap+xml; charset=UTF-8
-X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status">
-X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><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">
 
 <?xml version='1.0' encoding="utf-8"?>
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"
diff --git a/share/templates/en_US/soap_output.tmpl b/share/templates/en_US/soap_output.tmpl
index 9bae0ce..0e7c556 100644
--- a/share/templates/en_US/soap_output.tmpl
+++ b/share/templates/en_US/soap_output.tmpl
@@ -1,6 +1,7 @@
 Content-Type: application/soap+xml; charset=UTF-8
-X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status">
-X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><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">
 
 <?xml version="1.0" encoding="UTF-8"?>
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
diff --git a/share/templates/en_US/ucn_output.tmpl b/share/templates/en_US/ucn_output.tmpl
index 647435e..879550e 100644
--- a/share/templates/en_US/ucn_output.tmpl
+++ b/share/templates/en_US/ucn_output.tmpl
@@ -1,6 +1,7 @@
 Content-Type: application/xml; charset=UTF-8
-X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status">
-X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><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">
 
 <?xml version="1.0" encoding="UTF-8"?>
 <observationresponse xmlns="http://www.w3.org/unicorn/observationresponse"
diff --git a/share/templates/en_US/xml_output.tmpl b/share/templates/en_US/xml_output.tmpl
index b55d476..83d7785 100644
--- a/share/templates/en_US/xml_output.tmpl
+++ b/share/templates/en_US/xml_output.tmpl
@@ -1,6 +1,7 @@
 Content-Type: application/xml; charset=UTF-8
-X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status">
-X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors">
+X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><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">
 
 <?xml version="1.0" encoding="UTF-8"?>
 <!--