fix // in talk

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 60c7f1086d228ccc03c68f5364fe9ee71134803d..ac141b363cd0942462f6f0634fc17a5852117869 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -31,7 +31,9 @@ use WCY;
 use Sun;
 use Internet;
 use Script;
-
+use Net::Telnet;
+use QSL;
+use DB_File;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
@@ -66,7 +68,7 @@ sub new
 
        # ALWAYS output the user
        my $ref = Route::User::get($call);
-       DXProt::route_pc16($main::me, $main::routeroot, $ref) if $ref;
+       $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
 
        return $self;
 }
@@ -109,6 +111,11 @@ sub start
        $self->{here} = 1;
        $self->{prompt} = $user->prompt if $user->prompt;
 
+       # sort out new dx spot stuff
+       $user->wantdxcq(0) unless defined $user->{wantdxcq};
+       $user->wantdxitu(0) unless defined $user->{wantdxitu};  
+       $user->wantusstate(0) unless defined $user->{wantusstate};
+
        # sort out registration
        if ($main::reqreg == 1) {
                $self->{registered} = $user->registered;
@@ -411,15 +418,14 @@ sub run_cmd
 
        return () if length $cmdline == 0;
                
-       # strip out //
-       $cmdline =~ s|//|/|og;
-               
        # split the command line up into parts, the first part is the command
        my ($cmd, $args) = split /\s+/, $cmdline, 2;
        $args = "" unless defined $args;
                
        if ($cmd) {
-                       
+               # strip out // on command only
+               $cmd =~ s|//|/|g;
+                                       
                my ($path, $fcmd);
                        
                dbg("cmd: $cmd") if isdbg('command');
@@ -470,7 +476,7 @@ sub run_cmd
                        return ();
                }
        }
-       return (@ans);
+       return map {s/([^\s])\s+$/$1/; $_} @ans;
 }
 
 #
@@ -519,7 +525,7 @@ sub disconnect
                dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
 
                # issue a pc17 to everybody interested
-               DXProt::route_pc17($main::me, $main::routeroot, $uref);
+               $main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
        } else {
                confess "trying to disconnect a non existant user $call";
        }
@@ -797,6 +803,56 @@ sub announce
        $self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
 }
 
+# send a chat
+sub chat
+{
+       my $self = shift;
+       my $line = shift;
+       my $isolate = shift;
+       my $target = shift;
+       my $to = shift;
+       my $text = shift;
+       my ($filter, $hops);
+
+       return unless grep uc $_ eq $target, @{$self->{user}->{group}};
+       
+       $text =~ s/^\#\d+ //;
+       my $buf = "$target de $_[0]: $text";
+       $buf =~ s/\%5E/^/g;
+       $buf .= "\a\a" if $self->{beep};
+       $self->local_send('C', $buf);
+}
+
+sub format_dx_spot
+{
+       my $self = shift;
+
+       my $t = ztime($_[2]);
+       my $loc;
+       my $clth = $self->{consort} eq 'local' ? 29 : 30;
+       my $comment = substr $_[3], 0, $clth; 
+       $comment .= ' ' x ($clth - length($comment));
+       my $ref = DXUser->get_current($_[4]);
+       if ($ref) {
+               $loc = $ref->qra || '' if $self->{user}->wantgrid; 
+               $loc = ' ' . substr($loc, 0, 4) if $loc;
+       } 
+       $loc = "" unless $loc;
+
+       if ($self->{user}->wantdxitu) {
+               $loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
+               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
+       } elsif ($self->{user}->wantdxcq) {
+               $loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
+               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
+       } elsif ($self->{user}->wantusstate) {
+               $loc = ' ' . $_[13] if $_[13];
+               $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12]; 
+       }
+
+       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+}
+
 # send a dx spot
 sub dx_spot
 {
@@ -812,13 +868,9 @@ sub dx_spot
                return unless $filter;
        }
 
-
-       my $t = ztime($_[2]);
-       my $ref = DXUser->get_current($_[4]);
-       my $loc = $ref->qra if $ref && $ref->qra && $self->{user}->wantgrid;
-       $loc = ' ' . substr($loc, 0, 4) if $loc;
-       $loc = "" unless $loc;
-       my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-*s $t$loc", "$_[4]:", $_[0], $_[1], $self->{consort} eq 'local' ? 29 : 30, $_[3];
+       dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+       
+       my $buf = $self->format_dx_spot(@_);
        $buf .= "\a\a" if $self->{beep};
        $buf =~ s/\%5E/^/g;
        $self->local_send('X', $buf);