move ganerated stuff to local_data

[spider.git] / perl / BadWords.pm

diff --git a/perl/BadWords.pm b/perl/BadWords.pm
index 05e764fce9906f928dff56440fa83cf117a7d3c5..141b3e9a729b6a933149cb0bf71bf4a942938285 100644 (file)
--- a/perl/BadWords.pm
+++ b/perl/BadWords.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2000 Dirk Koopman
 #
-# $Id$
+#
 #
 
 package BadWords;
@@ -19,22 +19,16 @@ use IO::File;
 
 use vars qw($badword $regexcode);
 
-my $oldfn = "$main::data/badwords";
-my $regex = "$main::data/badw_regex";
-my $bwfn = "$main::data/badword";
+my $oldfn = localdata("badwords");
+my $regex = localdata("badw_regex");
+my $bwfn = localdata("badword");
 
 # copy issue ones across
-filecopy("$regex.issue", $regex) unless -e $regex;
+filecopy("$regex.gb.issue", $regex) unless -e $regex;
 filecopy("$bwfn.issue", $bwfn) unless -e $bwfn;
 
 $badword = new DXHash "badword";
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 # load the badwords file
 sub load
 {
@@ -75,7 +69,7 @@ sub create_regex
                                my $w = uc $_;
                                my @l = split //, $w;
                                my $e = join '+[\s\W]*', @l;
-                               $s .= "push \@out, \$1 if \$str =~ /($e)/;\n";
+                               $s .= "push \@out, \$1 if \$str =~ /\\b($e)/;\n";
                        }
                }
                $s .= "return \@out;\n}";
@@ -106,8 +100,7 @@ sub check
        
        return @out if @out;
        
-       for (split(/\s+/, $s)) {
-               s/\'?S$//;
+       for (split(/\b/, $s)) {
                push @out, $_ if $badword->in($_);
        }