X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=3342d1e948b7b1c76004bc8554f41a8222c4fc59;hb=refs%2Fheads%2Fnewusers;hp=51620b603857a3eae87ec2481465d76e31468264;hpb=5d197c9f7aa2ea796d86aa5473f93956b24cf1b7;p=spider.git

diff --git a/cmd/merge.pl b/cmd/merge.pl
index 51620b60..3342d1e9 100644
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -14,13 +14,18 @@ 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', $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];
+my ($spots, $wwv) = $f[1] =~ m{(\d+)/(\d+)} if $f[1];
 $spots = 10 unless $spots;
 $wwv = 5 unless $wwv;