projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add not here message
[spider.git]
/
cmd
/
merge.pl
diff --git
a/cmd/merge.pl
b/cmd/merge.pl
index 51620b603857a3eae87ec2481465d76e31468264..87a9827ebcedd4485a0ed75e1fe908bb4bea879c 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];
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;
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;