From: minima <minima>
Date: Fri, 21 Dec 2001 17:50:28 +0000 (+0000)
Subject: Fix 'not' in Filtering
X-Git-Tag: R_1_50~128
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=6dd42fb1eab723e1ac158d9cbebc682eb4c0c8fd;p=spider.git

Fix 'not' in Filtering
---

diff --git a/Changes b/Changes
index e96d3709..ddd5e59f 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+20Dec01=======================================================================
+1. Fix 'not' in filtering
 17Dec01=======================================================================
 1. added new satellite stuff from Steve K9AN. Fixed upper/lower problem
 in convkeps.pl.
diff --git a/perl/Filter.pm b/perl/Filter.pm
index 2c32bf02..5e89b08f 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -368,7 +368,7 @@ sub parse
 	my $user;
 	
 	# check the line for non legal characters
-	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)]/;
+	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)!]/;
 	
 	# add some spaces for ease of parsing
 	$line =~ s/([\(\)])/ $1 /g;
@@ -444,12 +444,16 @@ sub parse
 
 				if ($s) {
 					$s .= $conj ;
-					$s .= $not;
 					$user .= $conj;
-					$user .= $not;
 					$conj = ' && ';
-					$not = "";
 				}
+
+				if ($not) {
+					$s .= $not;
+					$user .= $not;
+					$not = '';
+				}
+
 				$user .= "$tok $val";
 				
 				my $fref;