X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=3f8cbcd14a291c594d12a9a6743f83a5c949cd34;hb=6262a02552be03f0f19bf2709b25e8d06a2f3bef;hp=4e35cb8b4abbc4036dc685ff2707250361235973;hpb=30dbf70f84b53174005810f64f546d2181e1a8c6;p=spider.git diff --git a/cmd/merge.pl b/cmd/merge.pl index 4e35cb8b..3f8cbcd1 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -3,7 +3,7 @@ # # Copyright (c) 1998 - Dirk Koopman G1TLH # -# $Id$ +# # my ($self, $line) = @_; @@ -16,10 +16,9 @@ return (1, $self->msg('e12')) if !$f[0]; my $call = uc $f[0]; return (1, $self->msg('e11')) if $call eq $main::mycall; -my $ref = DXCluster->get_exact($call); +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];