X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=b71ee95a5b81833acb4a1fc566592b832071529f;hb=ab811a0c902225075a9bd69749f65594079433a9;hp=0ca71917db987cb5637ebe5bec404b1ddb611e64;hpb=8178d787d7cc8040fa8958197582bba5c80e6f59;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 0ca71917..b71ee95a 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -10,7 +10,7 @@
 #
 # Copyright (c) 1999 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 # The NEW INSTRUCTIONS
 #
@@ -34,12 +34,6 @@ use Prefix;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw ($filterbasefn $in);
 
 $filterbasefn = "$main::root/filter";
@@ -92,7 +86,9 @@ sub compile
 	my $rr;
 	
 	if ($ref->{$ar} && exists $ref->{$ar}->{asc}) {
-		$ref->{$ar}->{code} = eval "sub { my \$r=shift; return $ref->{$ar}->{asc}; }" ;
+		my $s = $ref->{$ar}->{asc};	# an optimisation?
+		$s =~ s/\$r/\$_[0]/g;
+		$ref->{$ar}->{code} = eval "sub { $s }" ;
 		if ($@) {
 			my $sort = $ref->{sort};
 			my $name = $ref->{name};
@@ -114,17 +110,26 @@ sub read_in
 		$in = undef; 
 		my $s = readfilestr($fn);
 		my $newin = eval $s;
-		dbg($@) if $@;
+		if ($@) {
+			dbg($@);
+			unlink($fn);
+			return undef;
+		}
 		if ($in) {
 			$newin = new('Filter::Old', $sort, $call, $flag);
 			$newin->{filter} = $in;
-		} else {
+		} elsif (ref $newin && $newin->can('getfilkeys')) {
 			my $filter;
 			my $key;
 			foreach $key ($newin->getfilkeys) {
 				$newin->compile($key, 'reject');
 				$newin->compile($key, 'accept');
 			}
+		} else {
+			# error on reading file, delete and exit
+			dbg("empty or unreadable filter: $fn, deleted");
+			unlink($fn);
+			return undef;
 		}
 		return $newin;
 	}
@@ -305,7 +310,7 @@ sub install
 	} elsif ($name eq 'USER_DEFAULT') {
 		@dxchan = DXChannel::get_all_users();
 	} else {
-		$dxchan = DXChannel->get($name);
+		$dxchan = DXChannel::get($name);
 		push @dxchan, $dxchan if $dxchan;
 	}
 	foreach $dxchan (@dxchan) {
@@ -380,7 +385,7 @@ sub parse
 	while (@f) {
 		if ($ntoken == 0) {
 			
-			if (@f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser->get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
+			if (@f && $dxchan->priv >= 8 && ((is_callsign(uc $f[0]) && DXUser::get(uc $f[0])) || $f[0] =~ /(?:node|user)_default/)) {
 				$call = shift @f;
 				if ($f[0] eq 'input') {
 					shift @f;
@@ -545,7 +550,7 @@ sub cmd
 	return $dxchan->msg('filter5') unless $line;
 
 	my ($r, $filter, $fno, $user, $s) = $self->parse($dxchan, $sort, $line);
-	my $u = DXUser->get_current($user);
+	my $u = DXUser::get_current($user);
 	return (1, $dxchan->msg('isow', $user)) if $u && $u->isolate;
 	return (1, $filter) if $r;