X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Freject%2Fspots.pl;h=f8f7615cd33f09c2109cad18d3433578bf4aba41;hb=c3b04f794236d2416944d5a2a56f86f4a291a2a6;hp=0a3f77ec318abd9902098268178672e4e70005b4;hpb=211b54d504170a8c9dad2bf25b9ed686d5eeac11;p=spider.git diff --git a/cmd/reject/spots.pl b/cmd/reject/spots.pl index 0a3f77ec..f8f7615c 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 ? $r : $self->msg('filter1', $fno, $filter->{name}));