X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=cmd%2Fmerge.pl;h=c5f31f5afab87e1744cca6b6cec687439dcff200;hb=30788e921ae7fb6ca54f043d21f154bfd884dcc6;hp=a17c736ed5b492534a91ea1ba973d158e3b3d344;hpb=f2c147d7ffa7b8dab43cbf0baf6834f8bb962fe0;p=spider.git

diff --git a/cmd/merge.pl b/cmd/merge.pl
index a17c736e..c5f31f5a 100644
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -8,18 +8,20 @@
 
 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 $call = uc $f[0];
-my $dxchan = DXChannel->get($call);
-return (1, $self->msg('e10', $call)) unless $dxchan;
-return (1, $self->msg('e13', $call)) unless $dxchan->is_ak1a();
+my $ref = DXCluster->get_exact($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;