enforce the mutual exclusivity of dxcq, dxitu and usstate

diff --git a/cmd/set/dxcq.pl b/cmd/set/dxcq.pl
index c70ff168a2e822a19961572b67a2aecaa17ea5e1..0b6eeb7afed568244ee358f3dcf8a5bdcc13ad48 100644 (file)
--- a/cmd/set/dxcq.pl
+++ b/cmd/set/dxcq.pl
@@ -18,6 +18,14 @@ foreach $call (@args) {
        my $user = DXUser->get_current($call);
        if ($user) {
                $user->wantdxcq(1);
+               if ($user->wantdxitu) {
+                       push @out, $self->msg('dxituu', $call);
+                       $user->wantdxitu(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 7b68a31a278acc4183339450b820d086f7f7745f..cb8da9d07314eeab50b5e2c6f1767dde84f7958a 100644 (file)
--- a/cmd/set/dxitu.pl
+++ b/cmd/set/dxitu.pl
@@ -18,6 +18,14 @@ 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->wantusstate) {
+                       push @out, $self->msg('usstateu', $call);
+                       $user->wantusstate(0);
+               }
                $user->put;
                push @out, $self->msg('dxitus', $call);
        } else {

diff --git a/cmd/set/usstate.pl b/cmd/set/usstate.pl
index dd55cac266839ab500d31f61911039f060a0203f..7403843baee3f46f5312f9f239bfeb5920221b28 100644 (file)
--- a/cmd/set/usstate.pl
+++ b/cmd/set/usstate.pl
@@ -20,6 +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);
+               }
                $user->put;
                push @out, $self->msg('usstates', $call);
        } else {