X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=26cef42a6265828b32d0a7666e1c8c402eec3ce9;hb=630127263d91ec7f91ec247a8b8beccebd486475;hp=412ddccfe8ffd02a0eb7095a000567b7269c656f;hpb=61cdf7dc2b72c1898850a4d2aa403d712f22f8ee;p=spider.git diff --git a/cmd/merge.pl b/cmd/merge.pl index 412ddccf..26cef42a 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -14,10 +14,11 @@ return (1, $self->msg('e5')) if $self->priv < 5; return (1, $self->msg('e12')) if !$f[0]; 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];