W3C home > Mailing lists > Public > www-validator-cvs@w3.org > April 2008

validator/httpd/cgi-bin check,1.585,1.586

From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 28 Apr 2008 06:44:43 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1JqN6R-0002di-A6@lionel-hutz.w3.org>

Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv9866/httpd/cgi-bin

Modified Files:
	check 
Log Message:
subroutine namespace disambiguation, by setting all the main routines
under the W3C::Validator::MarkupValidator namespace.

 ----------------------------------------------------------------------


Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -d -r1.585 -r1.586
--- check	28 Apr 2008 03:42:43 -0000	1.585
+++ check	28 Apr 2008 06:44:40 -0000	1.586
@@ -34,6 +34,8 @@
 use warnings;
 use utf8;
 
+
+package W3C::Validator::MarkupValidator;
 #
 # Modules.  See also the BEGIN block further down below.
 #
@@ -2693,7 +2695,7 @@
     # 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', {});
+      W3C::Validator::MarkupValidator::add_warning('W09xml', {});
       return; # don't report this as an error, just proceed
     }
     # if mode is not XML, we do report the error. It should not happen in the case of <html> without doctype,
@@ -2740,12 +2742,12 @@
     if (lc($File->{Root}) eq 'html') { 
       my $dtd = ($File->{Mode} eq 'XML' ?
                  'XHTML 1.0 Transitional' : 'HTML 4.01 Transitional' );      
-      add_warning('W09', {W09_dtd => $dtd});
+      W3C::Validator::MarkupValidator::add_warning('W09', {W09_dtd => $dtd});
     }
     else { # not html root element, we are not using fallback
       if ($File->{Mode} ne 'XML') {
         $File->{'Is Valid'} = FALSE;
-        add_warning('W09nohtml', {});
+        W3C::Validator::MarkupValidator::add_warning('W09nohtml', {});
       }
     }
     
@@ -2753,7 +2755,7 @@
   }
 
   # TODO: calling exit() here is probably a bad idea
-  abort_if_error_flagged($File, O_DOCTYPE);
+  W3C::Validator::MarkupValidator::abort_if_error_flagged($File, O_DOCTYPE);
 
   push @{$File->{Errors}}, $err;
   # ...
Received on Monday, 28 April 2008 06:45:15 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 23:02:28 UTC