X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=26cef42a6265828b32d0a7666e1c8c402eec3ce9;hb=accadb4dd51333fae2726e8aa52564abc42f2e70;hp=c5f31f5afab87e1744cca6b6cec687439dcff200;hpb=30788e921ae7fb6ca54f043d21f154bfd884dcc6;p=spider.git diff --git a/cmd/merge.pl b/cmd/merge.pl index c5f31f5a..26cef42a 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -8,17 +8,17 @@ my ($self, $line) = @_; my @f = split /\s+/, $line; -my $call = uc $f[0]; # check for callsign return (1, $self->msg('e5')) if $self->priv < 5; 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];