From a453254d687774f352822492d500330a09fd7ebe Mon Sep 17 00:00:00 2001
From: djk <djk>
Date: Sun, 28 Nov 1999 17:41:21 +0000
Subject: [PATCH] fixed confusion over DXCluster->get_exact and DXUser->get

---
 Changes                 | 3 +++
 cmd/Commands_en.hlp     | 3 +++
 cmd/set/isolate.pl      | 2 +-
 cmd/set/node.pl         | 2 +-
 cmd/set/obscount.pl     | 4 +---
 cmd/set/pinginterval.pl | 2 +-
 cmd/set/privilege.pl    | 2 +-
 cmd/set/spider.pl       | 2 +-
 cmd/show/station.pl     | 3 ++-
 cmd/spoof.pl            | 2 +-
 cmd/unset/here.pl       | 2 +-
 cmd/unset/isolate.pl    | 2 +-
 cmd/unset/node.pl       | 2 +-
 perl/cluster.pl         | 2 +-
 14 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Changes b/Changes
index 86e8f017..17880093 100644
--- 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 97f4771e..ce9d426f 100644
--- 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 34fe22a3..7049ce92 100644
--- 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 81627f33..2a8c1479 100644
--- 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 8464cb26..fcbf81ee 100644
--- 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 8464cb26..45790377 100644
--- 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 60804a77..5a475e7f 100644
--- 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 b4ee04e1..549d3af7 100644
--- 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 40c7eddb..4aadd222 100644
--- 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 9616f657..8c8fda85 100644
--- 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 6bc62ae9..6666d4e7 100644
--- 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 143d5ebc..c575fa13 100644
--- 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 5fab45eb..b681d783 100644
--- 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 751a68a8..a84918bd 100755
--- 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
-- 
2.34.1