projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do non blocking connects
[spider.git]
/
cmd
/
merge.pl
diff --git
a/cmd/merge.pl
b/cmd/merge.pl
index a17c736ed5b492534a91ea1ba973d158e3b3d344..4e35cb8b4abbc4036dc685ff2707250361235973 100644
(file)
--- a/
cmd/merge.pl
+++ b/
cmd/merge.pl
@@
-14,12
+14,15
@@
return (1, $self->msg('e5')) if $self->priv < 5;
return (1, $self->msg('e12')) if !$f[0];
my $call = uc $f[0];
return (1, $self->msg('e12')) if !$f[0];
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();
+return (1, $self->msg('e11')) if $call eq $main::mycall;
+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;
$spots = 10 unless $spots;
$wwv = 5 unless $wwv;