Fix slots around the time

Fill the slots around the time in the order set/dxgid, set/usstate, set/dxcq or set/dxicq

diff --git a/Changes b/Changes
index 2bf1af042096988aa7f42d70703b2c7e32ae0e6b..b2e733f9e2b4a08993b69ab3b818a9613552abdd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,8 @@
+10Dec21=======================================================================
+1. Fix the output of set/dxgrid, set/usstate and set/dxcq or set/dxitu to how
+   it was always supposed to be since 2003.
+09Dec21=======================================================================
+1. Moved isregistered to DXChannel for safety...
 08Dec21=======================================================================
 1. Backport console.pl scrolling and width management changes.
 2. Backport show/registered cmd format from mojo.

diff --git a/cmd/set/dxcq.pl b/cmd/set/dxcq.pl
index bfe40760692a565c442a16b52e737fea73266339..f3de3303f6c29e34974755096ea0d5ace40e913a 100644 (file)
--- a/cmd/set/dxcq.pl
+++ b/cmd/set/dxcq.pl
@@ -22,10 +22,10 @@ foreach $call (@args) {
                        push @out, $self->msg('dxituu', $call);
                        $user->wantdxitu(0);
                }
-               if ($user->wantusstate) {
-                       push @out, $self->msg('usstateu', $call);
-                       $user->wantusstate(0);
-               }
+#              if ($user->wantusstate) {
+#                      push @out, $self->msg('usstateu', $call);
+#                      $user->wantusstate(0);
+#              }
                $user->put;
                push @out, $self->msg('dxcqs', $call);
        } else {

diff --git a/cmd/set/dxitu.pl b/cmd/set/dxitu.pl
index 0e002ba748fe99a70980deef98a3d1b87f76ef4c..a8fd500e179bd795f633f9d49f0cc274f533d0ae 100644 (file)
--- a/cmd/set/dxitu.pl
+++ b/cmd/set/dxitu.pl
@@ -18,10 +18,10 @@ foreach $call (@args) {
        my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantdxitu(1);
-               if ($user->wantdxcq) {
-                       push @out, $self->msg('dxcqu', $call);
-                       $user->wantdxcq(0);
-               }
+#              if ($user->wantdxcq) {
+#                      push @out, $self->msg('dxcqu', $call);
+#                      $user->wantdxcq(0);
+#              }
                if ($user->wantusstate) {
                        push @out, $self->msg('usstateu', $call);
                        $user->wantusstate(0);

diff --git a/cmd/set/usstate.pl b/cmd/set/usstate.pl
index 3babc8808c4f288d232fd18ff6f67b6813e7547f..af3072406eab11634f2ee7e79007fb6d00cb7e68 100644 (file)
--- a/cmd/set/usstate.pl
+++ b/cmd/set/usstate.pl
@@ -20,14 +20,14 @@ foreach $call (@args) {
        my $user = DXUser::get_current($call);
        if ($user) {
                $user->wantusstate(1);
-               if ($user->wantdxitu) {
-                       push @out, $self->msg('dxituu', $call);
-                       $user->wantdxitu(0);
-               }
-               if ($user->wantdxcq) {
-                       push @out, $self->msg('dxcqu', $call);
-                       $user->wantdxcq(0);
-               }
+#              if ($user->wantdxitu) {
+#                      push @out, $self->msg('dxituu', $call);
+#                      $user->wantdxitu(0);
+#              }
+#              if ($user->wantdxcq) {
+#                      push @out, $self->msg('dxcqu', $call);
+#                      $user->wantdxcq(0);
+#              }
                $user->put;
                push @out, $self->msg('usstates', $call);
        } else {

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 3eb351951c628c705b6c6d0a79cb57323809e0ac..6023320d7116bcea918e33c65a0cc102bfc04b36 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -958,40 +958,51 @@ sub format_dx_spot
 
        my $t = ztime($_[2]);
        my $loc = '';
-
-       my $clth = 30 + $self->{width} - 80;    # allow comment to grow according the screen width 
-       #       --$clth if $self->{consort} eq 'local';
+       my ($slot1, $slot2) = ('', '');
        
+       my $clth = 30 + $self->{width} - 80;    # allow comment to grow according the screen width 
        my $comment = substr (($_[3] || ''), 0, $clth);
        $comment =~ s/\t/ /g;
-       
        $comment .= ' ' x ($clth - (length($comment)));
-       
-    if ($self->{user}->wantgrid) {
+
+       if (!$slot1 && $self->{user}->wantgrid) {
                my $ref = DXUser::get_current($_[1]);
                if ($ref && $ref->qra) {
-                       my $cloc = ' ' . substr($ref->qra, 0, 4);
-                       $comment = substr $comment, 0,  ($clth - (length($comment)+length($cloc)));
-                       $comment .= $cloc;
+                       $slot1 = ' ' . substr($ref->qra, 0, 4);
+               }
+       }
+       if (!$slot1 && $self->{user}->wantusstate) {
+               $slot1 = " $_[12]" if $_[12];
+       }
+       unless ($slot1) {
+               if ($self->{user}->wantdxitu) {
+                       $slot1 = sprintf(" %2d", $_[8]) if defined $_[8]; 
+               } elsif ($self->{user}->wantdxcq) {
+                       $slot1 = sprintf(" %2d", $_[9]) if defined $_[9];
                }
+       }
+       $comment = substr($comment, 0,  $clth-length($slot1)) . $slot1 if $slot1;
+       
+    if (!$slot2 && $self->{user}->wantgrid) {
                my $origin = $_[4];
                $origin =~ s/-#$//;                     # sigh......
-               $ref = DXUser::get_current($origin);
+               my $ref = DXUser::get_current($origin);
                if ($ref && $ref->qra) {
-                       $loc = ' ' . substr($ref->qra, 0, 4);
+                       $slot2 = ' ' . substr($ref->qra, 0, 4);
+               }
+       }
+       if (!$slot2 && $self->{user}->wantusstate) {
+               $slot2 = " $_[13]" if $_[13];
+       }
+       unless ($slot2) {
+               if ($self->{user}->wantdxitu) {
+                       $slot2 = sprintf(" %2d", $_[10]) if defined $_[10]; 
+               } elsif ($self->{user}->wantdxcq) {
+                       $slot2 = sprintf(" %2d", $_[11]) if defined $_[11]; 
                }
-       } elsif ($self->{user}->wantdxitu) {
-               $loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
-               $comment = substr($comment, 0,  $clth-3) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
-       } elsif ($self->{user}->wantdxcq) {
-               $loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
-               $comment = substr($comment, 0, $clth-3) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
-       } elsif ($self->{user}->wantusstate) {
-               $loc = ' ' . $_[13] if $_[13];
-               $comment = substr($comment, 0,  $clth-3) . ' ' . $_[12] if $_[12]; 
        }
 
-       return sprintf "DX de %-8.8s%10.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+       return sprintf "DX de %-8.8s%10.1f  %-12.12s %-s $t$slot2", "$_[4]:", $_[0], $_[1], $comment;
 }
 
 # send a dx spot