fixed confusion over DXCluster->get_exact and DXUser->get

diff --git a/Changes b/Changes
index 86e8f017b9f572a8cfd6c524abcd1fd3f2a47b38..178800933ee21d17dc8f0bff2009b068f311cfc4 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+28Nov99=======================================================================
+1. fixed all the stupid errors introduced in 1.36 confusing DXUser->get with
+DXCluster->get_exact.
 24Nov99=======================================================================
 1. extended badmsg.pl stuff so that it works like the forward file and allows
 one to reject on to, from, origin and subject fields.

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 97f4771e3c30a149b060bad63da73724ec929f80..ce9d426f52feed582d390074ccdeace445dbbc23 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -441,6 +441,9 @@ what your latitude and longitude is. If you have not yet done a SET/QRA
 then this command will set your QRA locator for you. For example:-
   SET/LOCATION 52 22 N 0 57 E
 
+=== 0^SET/LOGININFO^Inform when a station logs in locally
+=== 0^UNSET/LOGININFO^Inform when a station logs out locally
+
 === 9^SET/LOCKOUT <call>^Stop a callsign connecting to the cluster
 === 9^UNSET/LOCKOUT <call>^Allow a callsign to connect to the cluster
 

diff --git a/cmd/set/isolate.pl b/cmd/set/isolate.pl
index 34fe22a349a63a3c2e7945fb6dc0ab44cec0f52c..7049ce92a449e0962825390dce7a81f2d7b136e1 100644 (file)
--- a/cmd/set/isolate.pl
+++ b/cmd/set/isolate.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get_exact($call);
+               $user = DXUser->get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/node.pl b/cmd/set/node.pl
index 81627f337ec814b3e9dcf191942a3b6b0cf84140..2a8c1479508b12c303c6da25a20ee503f2a1c887 100644 (file)
--- a/cmd/set/node.pl
+++ b/cmd/set/node.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get_exact($call);
+               $user = DXUser->get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/set/obscount.pl b/cmd/set/obscount.pl
index 8464cb26cce65beab24b3defaa97fecf9f36da99..fcbf81eec7c8a0d9068d5cb5d9b7c1e979e42ba4 100644 (file)
--- a/cmd/set/obscount.pl
+++ b/cmd/set/obscount.pl
@@ -22,9 +22,7 @@ $val *= 60 if $val < 120;
 
 foreach $call (@args) {
        $call = uc $call;
-       my $dxchan = DXChannel->get($call);
-       $user = $dxchan->user if $dxchan;
-       $user = DXUser->get_exact($call) unless $user;
+       $user = DXUser->get_current($call);
        if ($user) {
                unless ($user->sort eq 'A' || $user->sort eq 'S') {
                        push @out, $self->msg('e13', $call);

diff --git a/cmd/set/pinginterval.pl b/cmd/set/pinginterval.pl
index 8464cb26cce65beab24b3defaa97fecf9f36da99..457903778f403a521d012b497776838198360915 100644 (file)
--- a/cmd/set/pinginterval.pl
+++ b/cmd/set/pinginterval.pl
@@ -24,7 +24,7 @@ foreach $call (@args) {
        $call = uc $call;
        my $dxchan = DXChannel->get($call);
        $user = $dxchan->user if $dxchan;
-       $user = DXUser->get_exact($call) unless $user;
+       $user = DXUser->get($call) unless $user;
        if ($user) {
                unless ($user->sort eq 'A' || $user->sort eq 'S') {
                        push @out, $self->msg('e13', $call);

diff --git a/cmd/set/privilege.pl b/cmd/set/privilege.pl
index 60804a779f3eba72bb1cef0e2912920baff86045..5a475e7fe70ec90c07b1a8280a77276912eb22bc 100644 (file)
--- a/cmd/set/privilege.pl
+++ b/cmd/set/privilege.pl
@@ -32,7 +32,7 @@ foreach $call (@args) {
                        $ref->user->priv($priv);
                        $ref->user->put();
                }
-               if (!$ref && ($user = DXUser->get_exact($call))) {
+               if (!$ref && ($user = DXUser->get($call))) {
                        $user->priv($priv);
                        $user->put();
                }

diff --git a/cmd/set/spider.pl b/cmd/set/spider.pl
index b4ee04e1af4d5e7245ef3258ce57f1db9d808c91..549d3af7c56a22319c25964ba0136fb3491ee56b 100644 (file)
--- a/cmd/set/spider.pl
+++ b/cmd/set/spider.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get_exact($call);
+               $user = DXUser->get($call);
                $create = !$user;
                $user = DXUser->new($call) if $create;
                if ($user) {

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index 40c7eddbe3d6f59c7805ad9cba07b9a5f7f266eb..4aadd22292e7c1f2536001108263d9bf390f07b2 100644 (file)
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -59,7 +59,8 @@ if (@f == 0) {
                                $miles = $dx * 0.62133785;
                        }
                        
-                       my $cref = DXCluster->get($call);
+                       my $cref = DXCluster->get_exact($call);
+                       $cref = DXCluster->get($call) unless $cref;
                        my $seek = $cref->mynode->call if $cref;
 
                        if ($seek) {

diff --git a/cmd/spoof.pl b/cmd/spoof.pl
index 9616f6579cfcf90f88cb7a483ee6dd75c3e9c3c5..8c8fda85c6b516afc3d769eb6e4a4c38a085c5cc 100644 (file)
--- a/cmd/spoof.pl
+++ b/cmd/spoof.pl
@@ -25,7 +25,7 @@ if ($self->priv < 9) {
 
 my @out;
 $call = uc $call;
-my $user = DXUser->get_exact($call);
+my $user = DXUser->get($call);
 unless ($user) {
        $user = DXUser->new($call);
        push @out, $self->msg('spf1', $call);

diff --git a/cmd/unset/here.pl b/cmd/unset/here.pl
index 6bc62ae9740bd00deebfa96a9e6aadb508d6068a..6666d4e72d493eb65f749abff61dbbbc90cce20e 100644 (file)
--- a/cmd/unset/here.pl
+++ b/cmd/unset/here.pl
@@ -16,7 +16,7 @@ my @out;
 foreach $call (@args) {
   $call = uc $call;
   my $dxchan = DXChannel->get($call);
-  my $ref = DXCluster->get($call);
+  my $ref = DXCluster->get_exact($call);
   if ($dxchan && $ref) {
        $dxchan->here(0);
     $ref->here(0);

diff --git a/cmd/unset/isolate.pl b/cmd/unset/isolate.pl
index 143d5ebce70bbba49c1d12d2cf4d3b53cd3e11e3..c575fa13102ce8254efafc1779c28fcea013256a 100644 (file)
--- a/cmd/unset/isolate.pl
+++ b/cmd/unset/isolate.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get_exact($call);
+               $user = DXUser->get($call);
                return (1, $self->msg('usernf', $call)) if !$user; 
                $user->isolate(0);
                $user->close();

diff --git a/cmd/unset/node.pl b/cmd/unset/node.pl
index 5fab45ebe178cbed5183a12af80da2dfb337512c..b681d783ab2574b219c8698b277466259546e20b 100644 (file)
--- a/cmd/unset/node.pl
+++ b/cmd/unset/node.pl
@@ -23,7 +23,7 @@ foreach $call (@args) {
        if ($chan) {
                push @out, $self->msg('nodee1', $call);
        } else {
-               $user = DXUser->get_exact($call);
+               $user = DXUser->get($call);
                return (1, $self->msg('usernf', $call)) if !$user; 
                $user->sort('U');
                $user->close();

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 751a68a851f88f7a725306097c3e3c3fe6e4a81a..a84918bd10e4616eed0725256194ab57b352485b 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -70,7 +70,7 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.36";                             # the version no of the software
+$version = "1.37";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
 @outstanding_connects = ();     # list of outstanding connects