From: djk <djk>
Date: Sat, 22 May 1999 18:50:20 +0000 (+0000)
Subject: made spots work again
X-Git-Tag: R_1_28~19
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b5ca6131980983160f64b33f1dae9ecc05b58e6f;p=spider.git

made spots work again
removed detritus
---

diff --git a/Changes b/Changes
index 35feff18..11bea0bc 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
+21May99=======================================================================
+1. made set/nodx work again.
+2. mode dx stuff queue nicely again.
 18May99=======================================================================
 1. Added announce dup checking.
+2. Added system announce filtering.
 08May99=======================================================================
 1. Added a bit more checking to the rcmd thing to make more sure that this
 rcmd isn't coming from an imposter. Not possible to prevent everything 
diff --git a/cmd/Aliases b/cmd/Aliases
index 7d3b1300..d1f7cfb3 100644
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -89,15 +89,15 @@ package CmdAlias;
 	  '^set/noww', 'unset/wwv', 'unset/wwv',
 	  '^set/nowx', 'unset/wx', 'unset/wx',
 	  '^sh$', 'show', 'show',
-	  '^sh.*/c/n', 'show/configuration nodes', 'show/configuration',
-	  '^sh.*/c$', 'show/configuration', 'show/configuration',
-	  '^sh.*/dx/(\d+)-(\d+)', 'show/dx $1-$2', 'show/dx',
-	  '^sh.*/dx/(\d+)', 'show/dx $1', 'show/dx',
-	  '^sh.*/dx/d(\d+)', 'show/dx from $1', 'show/dx',
+	  '^sh\w*/c/n', 'show/configuration nodes', 'show/configuration',
+	  '^sh\w*/c$', 'show/configuration', 'show/configuration',
+	  '^sh\w*/dx/(\d+)-(\d+)', 'show/dx $1-$2', 'show/dx',
+	  '^sh\w*/dx/(\d+)', 'show/dx $1', 'show/dx',
+	  '^sh\w*/dx/d(\d+)', 'show/dx from $1', 'show/dx',
 	  '^sp$', 'send', 'send',
 	  '^sb$', 'send noprivate', 'send',	
-	  '^sh.*/wwv/(\d+)-(\d+)', 'show/wwv $1-$2', 'show/wwv',
-	  '^sh.*/wwv/(\d+)', 'show/wwv $1', 'show/wwv',
+	  '^sh\w*/w\w*/(\d+)-(\d+)', 'show/wwv $1-$2', 'show/wwv',
+	  '^sh\w*/w\w*/(\d+)', 'show/wwv $1', 'show/wwv',
     ],
 	't' => [
 	  '^t', 'talk', 'talk',
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5bda044a..7cde642c 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -735,10 +735,14 @@ sub send_dx_spot
 				$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
 				
 			}
-		} elsif ($dxchan->is_user) {
+		} elsif ($dxchan->is_user && $dxchan->{dx}) {
 			my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
 			$buf .= "\a\a" if $dxchan->beep;
-			$dxchan->send($buf) if !$hops || ($hops && $filter);
+			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+				$dxchan->send($buf) if !$hops || ($hops && $filter);
+			} else {
+				$dxchan->delay($buf) if !$hops || ($hops && $filter);
+			}
 		}					
 	}
 }