projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put in temp fix for pc10 talk crashes
[spider.git]
/
perl
/
Filter.pm
diff --git
a/perl/Filter.pm
b/perl/Filter.pm
index 0ca71917db987cb5637ebe5bec404b1ddb611e64..e599c59b9efad13a1ee02d963f6983219d924eb4 100644
(file)
--- a/
perl/Filter.pm
+++ b/
perl/Filter.pm
@@
-10,7
+10,7
@@
#
# Copyright (c) 1999 Dirk Koopman G1TLH
#
#
# Copyright (c) 1999 Dirk Koopman G1TLH
#
-#
$Id$
+#
#
# The NEW INSTRUCTIONS
#
#
# The NEW INSTRUCTIONS
#
@@
-34,12
+34,6
@@
use Prefix;
use strict;
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";
use vars qw ($filterbasefn $in);
$filterbasefn = "$main::root/filter";
@@
-92,7
+86,9
@@
sub compile
my $rr;
if ($ref->{$ar} && exists $ref->{$ar}->{asc}) {
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};
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;
$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;
if ($in) {
$newin = new('Filter::Old', $sort, $call, $flag);
$newin->{filter} = $in;
- } els
e
{
+ } els
if (ref $newin && $newin->can('getfilkeys'))
{
my $filter;
my $key;
foreach $key ($newin->getfilkeys) {
$newin->compile($key, 'reject');
$newin->compile($key, 'accept');
}
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;
}
}
return $newin;
}
@@
-305,7
+310,7
@@
sub install
} elsif ($name eq 'USER_DEFAULT') {
@dxchan = DXChannel::get_all_users();
} else {
} 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) {
push @dxchan, $dxchan if $dxchan;
}
foreach $dxchan (@dxchan) {