From: djk Date: Tue, 29 Jun 1999 20:43:43 +0000 (+0000) Subject: fixed merge command X-Git-Tag: R_1_31~25 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=30788e921ae7fb6ca54f043d21f154bfd884dcc6;p=spider.git fixed merge command --- diff --git a/Changes b/Changes index 82445704..68be4279 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +29Jun99======================================================================= +1. fixed merge command that I broke. 28Jun99======================================================================= 1. console.pl now works with history and editting. 2. added scrolling to stuff sent by the cluster. diff --git a/cmd/merge.pl b/cmd/merge.pl index a4370e08..c5f31f5a 100644 --- a/cmd/merge.pl +++ b/cmd/merge.pl @@ -8,13 +8,13 @@ my ($self, $line) = @_; my @f = split /\s+/, $line; +my $call = uc $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 $ref = DXCluster->get_exact($call); my $dxchan = $ref->dxchan if $ref; return (1, $self->msg('e10', $call)) unless $ref; diff --git a/perl/cluster.pl b/perl/cluster.pl index 1af0388a..51e8aed7 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -67,7 +67,7 @@ package main; @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) -$version = "1.30"; # the version no of the software +$version = "1.31"; # the version no of the software $starttime = 0; # the starting time of the cluster $lockfn = "cluster.lock"; # lock file name diff --git a/perl/console.pl b/perl/console.pl index 977285da..14c945a5 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -252,8 +252,11 @@ sub rec_stdin $pos++; $lth++; } elsif ($r eq "\014" || $r eq "\022") { + $top->touchwin(); + $bot->touchwin(); $scr->touchwin(); $scr->refresh(); + $top->refresh(); } elsif ($r eq "\013") { $inbuf = substr($inbuf, 0, $pos); $lth = length $inbuf;