X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=3342d1e948b7b1c76004bc8554f41a8222c4fc59;hb=eac4538f1f78b3d014539dc548fc6322e8337429;hp=c5f31f5afab87e1744cca6b6cec687439dcff200;hpb=30788e921ae7fb6ca54f043d21f154bfd884dcc6;p=spider.git diff --git a/cmd/merge.pl b/cmd/merge.pl index c5f31f5a..3342d1e9 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -3,22 +3,26 @@ # # Copyright (c) 1998 - Dirk Koopman G1TLH # -# $Id$ +# # 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]; -return (1, $self->msg('e11')) if $call eq $main::mycall; -my $ref = DXCluster->get_exact($call); +my $call = uc $f[0]; +return (1, $self->msg('e11', $call)) if $call eq $main::mycall; + if ($call eq $main::mycall) { + push @out, $self->msg('e11', $call); + next; + } + +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];