X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FBadWords.pm;h=141b3e9a729b6a933149cb0bf71bf4a942938285;hb=refs%2Fheads%2Fnewusers;hp=d0572cc2de4cb9f99b60b02461383d56c8117e6f;hpb=299bbec5a5628c3333cdf4ed45fed3e0c21ca753;p=spider.git

diff --git a/perl/BadWords.pm b/perl/BadWords.pm
index d0572cc2..141b3e9a 100644
--- a/perl/BadWords.pm
+++ b/perl/BadWords.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2000 Dirk Koopman
 #
-# $Id$
+#
 #
 
 package BadWords;
@@ -19,9 +19,9 @@ 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.gb.issue", $regex) unless -e $regex;
@@ -29,12 +29,6 @@ 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
 {
@@ -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($_);
 	}