* identify validator with its cfg_homepage (was, mistakenly, server info)

* send number of errors as scalar, not human-readable string
* count warnings
* preparse warnings handled by soap_warnings.tmpl (based on warnings.tmpl)
* output preparse and parse warning messages

2 files changed, 102 insertions, 39 deletions

diff --git a/share/templates/en_US/soap_output.tmpl b/share/templates/en_US/soap_output.tmpl
index 0f6829e..b6cf15a 100644
--- a/share/templates/en_US/soap_output.tmpl
+++ b/share/templates/en_US/soap_output.tmpl
@@ -7,48 +7,34 @@ X-W3C-Validator-Errors: <TMPL_VAR NAME="number_of_errors">
 <env:Body>
 <m:markupvalidationresponse env:encodingStyle="http://www.w3.org/2003/05/soap-encoding" xmlns:m="http://www.w3.org/2005/10/markup-validator">
     <m:uri><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></m:uri>
-    <m:checkedby><TMPL_VAR NAME="file_server" ESCAPE="HTML"></m:checkedby>
+    <m:checkedby><TMPL_VAR NAME="cfg_home_page" ESCAPE="HTML"></m:checkedby>
     <m:doctype><TMPL_VAR NAME="file_doctype" ESCAPE="HTML"></m:doctype>
     <m:validity><TMPL_VAR NAME="valid_status"></m:validity>
     <m:errors>
-        <m:errorcount><TMPL_VAR NAME="number_of_errors"></m:errorcount>
+        <m:errorcount><TMPL_VAR NAME="valid_errors_num"></m:errorcount>
         <m:errorlist>
-        <TMPL_LOOP NAME="file_errors">
+          <TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_err">
             <m:error>
-                <!-- Line of the current error -->                 
-                <m:line>                                           
-                    <TMPL_VAR NAME="line" ESCAPE="HTML">                 
-                </m:line>                                          
-                <!-- Column of the current error -->               
-                <m:col>                                            
-                    <TMPL_VAR NAME="char" ESCAPE="HTML">                  
-                </m:col>                                           
-                <!-- Offset of the current error -->               
-                <m:offset>                                         
-                    ???               
-                </m:offset>                                        
-                <!-- Textual message of the error -->              
-                <m:message>                                        
-                    <TMPL_VAR NAME="msg" ESCAPE="HTML">                        
-                </m:message>                                       
-            </m:error>                                             
-        </TMPL_LOOP>                                                                 
+                <m:line><TMPL_VAR NAME="line"></m:line>
+                <m:col><TMPL_VAR NAME="char"></m:col>                                           
+                <m:message><TMPL_VAR NAME="msg" ESCAPE="HTML"></m:message>
+            </m:error>
+           </TMPL_IF></TMPL_LOOP>
         </m:errorlist>
-    </m:errors>                                             
-    <m:warnings>                                                       
-        <!-- Number of warnings -->                                    
-        <m:warningcount>                                               
-            <xsl:value-of select="$warningcount"/>                     
-        </m:warningcount>                                              
-        <!-- List of warnings -->                                      
-        <m:warninglist>                                                
-            <TMPL_LOOP NAME="file_warnings">
-            <m:warning>                                            
-                <TMPL_VAR NAME="Message" ESCAPE="HTML">
-            </m:warning>                                           
-            </TMPL_LOOP>                                         
-        </m:warninglist>                                               
-    </m:warnings>                                                      
-</m:markupvalidationresponse>                                          
-</env:Body>                                                                
-</env:Envelope>                                                                
+    </m:errors>
+    <m:warnings>
+        <m:warningcount><TMPL_VAR NAME="valid_warnings_num"></m:warningcount>
+        <m:warninglist>
+        <TMPL_IF NAME="have_warnings"><TMPL_INCLUDE NAME="soap_warnings.tmpl"></TMPL_IF>
+        <TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_warn">
+            <m:warning>
+                <m:line><TMPL_VAR NAME="line"></m:line>
+                <m:col><TMPL_VAR NAME="char"></m:col>                                           
+                <m:message><TMPL_VAR NAME="msg" ESCAPE="HTML"></m:message>
+            </m:warning>
+          </TMPL_IF></TMPL_LOOP>
+        </m:warninglist>
+    </m:warnings>
+</m:markupvalidationresponse>
+</env:Body>
+</env:Envelope>
diff --git a/share/templates/en_US/soap_warnings.tmpl b/share/templates/en_US/soap_warnings.tmpl
new file mode 100644
index 0000000..5512440
--- /dev/null
+++ b/share/templates/en_US/soap_warnings.tmpl
@@ -0,0 +1,77 @@
+<TMPL_IF NAME="W01">
+  <m:warning><m:message>Missing "charset" attribute for
+    "<TMPL_VAR NAME="W01_ct" ESCAPE="HTML">" document.</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W02">
+  <m:warning><m:message>No Character Encoding Found!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W03">
+  <m:warning><m:message>Character Encoding Override in effect!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W04">
+  <m:warning><m:message>No Character Encoding Found!
+    <TMPL_IF NAME="W04_override">
+      Using
+    <TMPL_ELSE>
+      Falling back to 
+    </TMPL_IF>
+    <TMPL_IF NAME="W04_charset"><TMPL_VAR NAME="W04_charset" ESCAPE="HTML"><TMPL_ELSE>UTF-8</TMPL_IF>.
+  </m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W05">
+  <m:warning><m:message>DOCTYPE Override in effect!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W06">
+  <m:warning><m:message>Unable to Determine Parse Mode!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W07">
+  <m:warning><m:message>Contradictory Parse Modes Detected!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W08">
+  <m:warning><m:message>Unknown Parse Mode!</m:message></m:warning>
+</TMPL_IF>
+<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="W10">
+  <m:warning><m:message>Unknown Namespace Found</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W11">
+  <m:warning><m:message>Namespace Found in non-XML Document</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W12">
+  <m:warning><m:message>No Namespace Found</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W13">
+  <m:warning><m:message>DOCTYPE Override in effect!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W14">
+  <m:warning><m:message>No DOCTYPE Found!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W15">
+  <m:warning><m:message>DOCTYPE Override in effect!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W16">
+  <m:warning><m:message>No DOCTYPE Found! Falling Back to
+    <TMPL_VAR NAME="W16_dtd" ESCAPE="HTML">.</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W17">
+  <m:warning><m:message>No Character Encoding detected!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W18">
+  <m:warning><m:message>Character Encoding mismatch!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W19">
+  <m:warning><m:message>Character Encoding mismatch!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W20">
+  <m:warning><m:message>Character Encoding mismatch!</m:message></m:warning>
+</TMPL_IF>
+<TMPL_IF NAME="W21">
+  <m:warning><m:message>Byte-Order Mark found in UTF-8 File.</m:message></m:warning>
+</TMPL_IF>
+
+<TMPL_IF NAME="W@@">
+  <m:warning><m:message></m:message></m:warning>
+</TMPL_IF>
+