X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=26cef42a6265828b32d0a7666e1c8c402eec3ce9;hb=d0d643e52b8c7ab9f481c78edb8ab953a5da3b29;hp=a4370e082e5f9eecf8028a70268c7b4a6a08bd04;hpb=d8187e68f181966eea2dca949ca13e2cbbaf072e;p=spider.git diff --git a/cmd/merge.pl b/cmd/merge.pl index a4370e08..26cef42a 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -12,13 +12,13 @@ my @f = split /\s+/, $line; # check for callsign return (1, $self->msg('e5')) if $self->priv < 5; return (1, $self->msg('e12')) if !$f[0]; -return (1, $self->msg('e11')) if $call eq $main::mycall; my $call = uc $f[0]; -my $ref = DXCluster->get_exact($call); +return (1, $self->msg('e11')) if $call eq $main::mycall; + +my $ref = Route::Node::get($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];