X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=51620b603857a3eae87ec2481465d76e31468264;hb=5d197c9f7aa2ea796d86aa5473f93956b24cf1b7;hp=a17c736ed5b492534a91ea1ba973d158e3b3d344;hpb=f3adc82a0299652d929b73c718127fa38571eec5;p=spider.git diff --git a/cmd/merge.pl b/cmd/merge.pl index a17c736e..51620b60 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -14,9 +14,10 @@ return (1, $self->msg('e5')) if $self->priv < 5; return (1, $self->msg('e12')) if !$f[0]; my $call = uc $f[0]; -my $dxchan = DXChannel->get($call); -return (1, $self->msg('e10', $call)) unless $dxchan; -return (1, $self->msg('e13', $call)) unless $dxchan->is_ak1a(); +my $ref = DXCluster->get_exact($call); +my $dxchan = $ref->dxchan if $ref; +return (1, $self->msg('e10', $call)) unless $ref; +return (1, $self->msg('e13', $call)) unless $ref->isa('DXNode'); my ($spots, $wwv) = $f[1] =~ m{(\d+/\d+)} if $f[1];