X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FBadWords.pm;h=d0572cc2de4cb9f99b60b02461383d56c8117e6f;hb=b53046d61e0d9ff16e95e12d2f3b52ffa4e735d7;hp=b598c385d4e940f45716a4f2f35c303ad9b46e1e;hpb=c77ea09e91a5f7c3052e3e30dfb48fcaad1e0dcd;p=spider.git diff --git a/perl/BadWords.pm b/perl/BadWords.pm index b598c385..d0572cc2 100644 --- a/perl/BadWords.pm +++ b/perl/BadWords.pm @@ -24,7 +24,7 @@ my $regex = "$main::data/badw_regex"; my $bwfn = "$main::data/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"; @@ -75,7 +75,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}"; @@ -102,7 +102,6 @@ sub check my $s = uc shift; my @out; - dbg($s) if isdbg('badword'); push @out, &$regexcode($s) if $regexcode; return @out if @out;