- From: Olivier Thereaux <ot@dev.w3.org>
- Date: Tue, 10 Aug 2004 05:27:07 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/perl/modules/W3C/LogValidator/lib/W3C/LogValidator
In directory hutz:/tmp/cvs-serv8883
Modified Files:
Basic.pm HTMLValidator.pm CSSValidator.pm SurveyEngine.pm
Log Message:
Changing option name for Excluded/Ignored Areas
mapping version to CVS revision
Index: SurveyEngine.pm
===================================================================
RCS file: /sources/public/perl/modules/W3C/LogValidator/lib/W3C/LogValidator/SurveyEngine.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SurveyEngine.pm 15 Jul 2004 03:06:53 -0000 1.4
+++ SurveyEngine.pm 10 Aug 2004 05:27:05 -0000 1.5
@@ -4,7 +4,7 @@
# Massachusetts Institute of Technology.
# written by Matthieu Faure <matthieu@faure.nom.fr> for W3C
# maintained by olivier Thereaux <ot@w3.org> and Matthieu Faure <matthieu@faure.nom.fr>
-# SurveyEngine.pm v0.1 2004/05/17
+# $Id$
package W3C::LogValidator::SurveyEngine;
use strict;
@@ -15,7 +15,7 @@
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw();
-our $VERSION = '0.1';
+our $VERSION = q$Revision$;
###########################
@@ -67,11 +67,15 @@
my $self = shift;
my @authorized_extensions = split(" ", $self->auth_ext);
my @trimmed_uris;
+ my $exclude_regexp = "";
+ my @excluded_areas;
+ $exclude_regexp = $config{ExcludeAreas};
+ if ($exclude_regexp){
+ $exclude_regexp =~ s/\//\\\//g ;
+ @excluded_areas = split(" ", $exclude_regexp);
+ }
+ else { print "nothing to exclude" if ($verbose >2);}
my $uri;
- my $ignore_regexp = "";
- $ignore_regexp = $config{IgnoreArea};
- $ignore_regexp =~ s/\//\\\//g ;
- my @ignored_areas = split(" ", $ignore_regexp);
while ($uri = shift)
{
my $uri_ext = "";
@@ -85,21 +89,27 @@
{
if ($ext eq $uri_ext) { $match = 1; }
}
- foreach my $area (@ignored_areas)
+ if ($match)
{
+ foreach my $area (@excluded_areas)
+ {
if ($uri =~ /$area/)
{
- print "ignoring $uri matching $area \n" if ($verbose > 2) ;
+ my $slasharea = $area;
+ $slasharea =~ s/\\\//\//g;
+ $slasharea =~ s/\\././g;
+ print "Ignoring $uri matching $slasharea \n" if ($verbose > 2) ;
$match = 0;
}
- }
+
+ }
+ }
push @trimmed_uris,$uri if ($match);
}
return @trimmed_uris;
}
-
#########################################
# Actual subroutine to check the list of uris #
#########################################
Index: HTMLValidator.pm
===================================================================
RCS file: /sources/public/perl/modules/W3C/LogValidator/lib/W3C/LogValidator/HTMLValidator.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- HTMLValidator.pm 14 Jul 2004 02:40:01 -0000 1.11
+++ HTMLValidator.pm 10 Aug 2004 05:27:05 -0000 1.12
@@ -15,7 +15,8 @@
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw();
-our $VERSION = '0.2';
+our $VERSION = q$Revision$q;
+
###########################
@@ -136,11 +137,14 @@
my $self = shift;
my @authorized_extensions = split(" ", $self->auth_ext);
my @trimmed_uris;
- my $ignore_regexp = "";
- $ignore_regexp = $config{IgnoreArea};
- $ignore_regexp =~ s/\//\\\//g ;
- my @ignored_areas = split(" ", $ignore_regexp);
-
+ my $exclude_regexp = "";
+ my @excluded_areas;
+ $exclude_regexp = $config{ExcludeAreas};
+ if ($exclude_regexp){
+ $exclude_regexp =~ s/\//\\\//g ;
+ @excluded_areas = split(" ", $exclude_regexp);
+ }
+ else { print "nothing to exclude" if ($verbose >2);}
my $uri;
while ($uri = shift)
{
@@ -156,15 +160,22 @@
{
if ($ext eq $uri_ext) { $match = 1; }
}
- foreach my $area (@ignored_areas)
- {
+ if ($match)
+ {
+ foreach my $area (@excluded_areas)
+ {
if ($uri =~ /$area/)
{
- print "ignoring $uri matching $area \n" if ($verbose > 2) ;
+ my $slasharea = $area;
+ $slasharea =~ s/\\\//\//g;
+ $slasharea =~ s/\\././g;
+ print "Ignoring $uri matching $slasharea \n" if ($verbose > 2) ;
$match = 0;
}
- }
+ }
+ }
+
push @trimmed_uris,$uri if ($match);
}
return @trimmed_uris;
Index: Basic.pm
===================================================================
RCS file: /sources/public/perl/modules/W3C/LogValidator/lib/W3C/LogValidator/Basic.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Basic.pm 14 Jul 2004 02:40:01 -0000 1.5
+++ Basic.pm 10 Aug 2004 05:27:05 -0000 1.6
@@ -16,7 +16,7 @@
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw();
-our $VERSION = '0.1';
+our $VERSION = q$Revision$q;
###########################
@@ -48,20 +48,23 @@
{
my $self = shift;
my @trimmed_uris;
- my $ignore_regexp = "";
- $ignore_regexp = $config{IgnoreArea};
- $ignore_regexp =~ s/\//\\\//g ;
- my @ignored_areas = split(" ", $ignore_regexp);
+ my $exclude_regexp = "";
+ $exclude_regexp = $config{ExcludeAreas};
+ $exclude_regexp =~ s/\//\\\//g ;
+ my @exclude_areas = split(" ", $exclude_regexp);
my $uri;
while ($uri = shift)
{
my $acceptable = 1;
- foreach my $area (@ignored_areas)
+ foreach my $area (@exclude_areas)
{
if ($uri =~ /$area/)
- {
- print "ignoring $uri matching $area \n" if ($verbose > 2) ;
+ {
+ my $slasharea = $area;
+ $slasharea =~ s/\\\//\//g;
+ $slasharea =~ s/\\././g;
+ print "Ignoring $uri matching $slasharea \n" if ($verbose > 2) ;
$acceptable = 0;
}
}
Index: CSSValidator.pm
===================================================================
RCS file: /sources/public/perl/modules/W3C/LogValidator/lib/W3C/LogValidator/CSSValidator.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CSSValidator.pm 14 Jul 2004 02:40:01 -0000 1.6
+++ CSSValidator.pm 10 Aug 2004 05:27:05 -0000 1.7
@@ -17,7 +17,7 @@
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw();
-our $VERSION = '0.1';
+our $VERSION = q$Revision$;
###########################
@@ -115,14 +115,18 @@
sub trim_uris
{
- my $self = shift;
+ my $self = shift;
my @authorized_extensions = split(" ", $self->auth_ext);
- my @trimmed_uris;
- my $uri;
- my $ignore_regexp = "";
- $ignore_regexp = $config{IgnoreArea};
- $ignore_regexp =~ s/\//\\\//g ;
- my @ignored_areas = split(" ", $ignore_regexp);
+ my @trimmed_uris;
+ my $exclude_regexp = "";
+ my @excluded_areas;
+ $exclude_regexp = $config{ExcludeAreas};
+ if ($exclude_regexp){
+ $exclude_regexp =~ s/\//\\\//g ;
+ @excluded_areas = split(" ", $exclude_regexp);
+ }
+ else { print "nothing to exclude" if ($verbose >2);}
+ my $uri;
while ($uri = shift)
{
my $uri_ext = "";
@@ -137,14 +141,21 @@
{
if ($ext eq $uri_ext) { $match = 1; }
}
- foreach my $area (@ignored_areas)
+ if ($match)
{
+ foreach my $area (@excluded_areas)
+ {
if ($uri =~ /$area/)
{
- print "ignoring $uri matching $area \n" if ($verbose > 2) ;
+ my $slasharea = $area;
+ $slasharea =~ s/\\\//\//g;
+ $slasharea =~ s/\\././g;
+ print "Ignoring $uri matching $slasharea \n" if ($verbose > 2) ;
$match = 0;
}
- }
+
+ }
+ }
push @trimmed_uris,$uri if ($match);
}
@@ -234,7 +245,7 @@
}
print "Done!\n" if $verbose;
- print "invalid_census $invalid_census \n" if ($verbose > 2 );
+# print "invalid_census $invalid_census \n" if ($verbose > 2 );
if ($invalid_census) # we found invalid docs
{
if ($invalid_census eq 1) # let's repect grammar here
Received on Tuesday, 10 August 2004 05:27:07 UTC