projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
normalise spot dupe fields, normalise qrg by 25khz
[spider.git]
/
cmd
/
merge.pl
diff --git
a/cmd/merge.pl
b/cmd/merge.pl
index a4370e082e5f9eecf8028a70268c7b4a6a08bd04..3342d1e948b7b1c76004bc8554f41a8222c4fc59 100644
(file)
--- a/
cmd/merge.pl
+++ b/
cmd/merge.pl
@@
-3,7
+3,7
@@
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-#
$Id$
+#
#
my ($self, $line) = @_;
#
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];
# 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 $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;
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];