projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change the Hello to use default values
[spider.git]
/
perl
/
Filter.pm
diff --git
a/perl/Filter.pm
b/perl/Filter.pm
index 0ca71917db987cb5637ebe5bec404b1ddb611e64..ff4ab2e868e95aff35aa6014edaa2018c98045c5 100644
(file)
--- a/
perl/Filter.pm
+++ b/
perl/Filter.pm
@@
-92,7
+92,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};
@@
-196,6
+198,7
@@
sub it
my $key;
my $type = 'Dunno';
my $asc = '?';
my $key;
my $type = 'Dunno';
my $asc = '?';
+ my $data = ref $_[0] ? shift : \@_;
my $r = @keys > 0 ? 0 : 1;
foreach $key (@keys) {
my $r = @keys > 0 ? 0 : 1;
foreach $key (@keys) {
@@
-203,7
+206,7
@@
sub it
if ($filter->{reject} && exists $filter->{reject}->{code}) {
$type = 'reject';
$asc = $filter->{reject}->{user};
if ($filter->{reject} && exists $filter->{reject}->{code}) {
$type = 'reject';
$asc = $filter->{reject}->{user};
- if (&{$filter->{reject}->{code}}(
\@_
)) {
+ if (&{$filter->{reject}->{code}}(
$data
)) {
$r = 0;
last;
} else {
$r = 0;
last;
} else {
@@
-213,7
+216,7
@@
sub it
if ($filter->{accept} && exists $filter->{accept}->{code}) {
$type = 'accept';
$asc = $filter->{accept}->{user};
if ($filter->{accept} && exists $filter->{accept}->{code}) {
$type = 'accept';
$asc = $filter->{accept}->{user};
- if (&{$filter->{accept}->{code}}(
\@_
)) {
+ if (&{$filter->{accept}->{code}}(
$data
)) {
$r = 1;
last;
} else {
$r = 1;
last;
} else {
@@
-226,7
+229,7
@@
sub it
my $hops = $self->{hops} if exists $self->{hops};
if (isdbg('filter')) {
my $hops = $self->{hops} if exists $self->{hops};
if (isdbg('filter')) {
- my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @
_
;
+ my $args = join '\',\'', map {defined $_ ? $_ : 'undef'} @
$data
;
my $true = $r ? "OK " : "REJ";
my $sort = $self->{sort};
my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";
my $true = $r ? "OK " : "REJ";
my $sort = $self->{sort};
my $dir = $self->{name} =~ /^in_/i ? "IN " : "OUT";