fix set/dxcq et al as off

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 731379df7ce4571aaec4713354315bd94c96c4b3..1750fee157acd6e87d497ec539642a6b08530893 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -31,7 +31,7 @@ use WCY;
 use Sun;
 use Internet;
 use Script;
-
+use Net::Telnet;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
@@ -109,6 +109,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;
@@ -813,6 +818,8 @@ sub dx_spot
        }
 
 
+       dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+       
        my $t = ztime($_[2]);
        my $loc;
        my $clth = $self->{consort} eq 'local' ? 29 : 30;
@@ -825,16 +832,15 @@ sub dx_spot
        } 
        $loc = "" unless $loc;
 
-       # USDB stuff
-       if ($USDB::present && $self->{user}->wantusstate) {
-               my ($city, $state) = USDB::get($_[4]);
-               if ($state) {
-                       $loc = ' ' . $state;
-               }
-               ($city, $state) = USDB::get($_[1]);
-               if ($state) {
-                       $comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $state; 
-               }
+       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]; 
        }
 
        my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;