added a clrtoeol and a ^A

[spider.git] / cmd / merge.pl

diff --git a/cmd/merge.pl b/cmd/merge.pl
index 51620b603857a3eae87ec2481465d76e31468264..a4370e082e5f9eecf8028a70268c7b4a6a08bd04 100644 (file)
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -12,6 +12,7 @@ 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];
+return (1, $self->msg('e11')) if $call eq $main::mycall;
 
 my $call = uc $f[0];
 my $ref = DXCluster->get_exact($call);
@@ -20,7 +21,7 @@ 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;