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

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 0ca71917..3009883b 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -92,7 +92,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 +116,25 @@ 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
+			unlink($fn);
+			return undef;
 		}
 		return $newin;
 	}
@@ -305,7 +315,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) {