added cty-1603 and changes to wpxloc.raw from AD1C and WB8ZRL.

[spider.git] / cmd / merge.pl

diff --git a/cmd/merge.pl b/cmd/merge.pl
index 51620b603857a3eae87ec2481465d76e31468264..26cef42a6265828b32d0a7666e1c8c402eec3ce9 100644 (file)
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -14,13 +14,14 @@ 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')) if $call eq $main::mycall;
+
+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;