X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=3342d1e948b7b1c76004bc8554f41a8222c4fc59;hb=eac4538f1f78b3d014539dc548fc6322e8337429;hp=a4370e082e5f9eecf8028a70268c7b4a6a08bd04;hpb=d8187e68f181966eea2dca949ca13e2cbbaf072e;p=spider.git

diff --git a/cmd/merge.pl b/cmd/merge.pl
index a4370e08..3342d1e9 100644
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -12,13 +12,17 @@ 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', $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];