X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmerge.pl;h=4e35cb8b4abbc4036dc685ff2707250361235973;hb=4398f80612fe9b55fbbc3e62be7c03ffa59a9f2b;hp=51620b603857a3eae87ec2481465d76e31468264;hpb=5d197c9f7aa2ea796d86aa5473f93956b24cf1b7;p=spider.git diff --git a/cmd/merge.pl b/cmd/merge.pl index 51620b60..4e35cb8b 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -14,13 +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('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;