X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Freject%2Fspots.pl;h=d434f0f364640d1ff79e394ef755a2f24ca03d2b;hb=668e4252d23e2eda2a6b234f1031e1c1a5f43d15;hp=0a3f77ec318abd9902098268178672e4e70005b4;hpb=211b54d504170a8c9dad2bf25b9ed686d5eeac11;p=spider.git diff --git a/cmd/reject/spots.pl b/cmd/reject/spots.pl index 0a3f77ec..d434f0f3 100644 --- a/cmd/reject/spots.pl +++ b/cmd/reject/spots.pl @@ -7,25 +7,8 @@ # my ($self, $line) = @_; -my $sort = 'reject'; +my $type = 'reject'; +my $sort = 'spots'; -my ($r, $filter, $fno, $user, $s) = $Spot::filterdef->parse($self, $line); -return (0, $filter) if $r; - -my $fn = "filter$fno"; - -$filter->{$fn} = {} unless exists $filter->{$fn}; -$filter->{$fn}->{$sort} = {} unless exists $filter->{$fn}->{$sort}; - -$filter->{$fn}->{$sort}->{user} = $user; -my $ref = eval $s; -return (0, $s, $@) if $@; - -$filter->{$fn}->{$sort}->{asc} = $s; -$r = $filter->write; -return (0, $r) if $r; - -$filter->{$fn}->{$sort}->{code} = $ref; -$filter->install; - -return (0, $self->msg('filter1', $fno, $filter->{name})); +my ($r, $filter, $fno) = $Spot::filterdef->cmd($self, $sort, $type, $line); +return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name}));