X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FBadWords.pm;h=df6a15571e112f14864960723aafacf621d19ec2;hb=2a788b7611dfa76a98a7699518f025b4e905fed2;hp=05e764fce9906f928dff56440fa83cf117a7d3c5;hpb=f415973f5f2afa49403e76a1fc1dec29a71be950;p=spider.git diff --git a/perl/BadWords.pm b/perl/BadWords.pm index 05e764fc..df6a1557 100644 --- a/perl/BadWords.pm +++ b/perl/BadWords.pm @@ -24,14 +24,14 @@ 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"; use vars qw($VERSION $BRANCH); $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -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}";