X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=dd780699b62e6225727aa771f064e448dc1a3ca8;hb=dd864f3c8ed69e63f9873bf1728813a7cc56aa79;hp=763bf9b0aace735bd8e7db629724c2c594fe15d6;hpb=9a55af9586711ecdea8dc9b0da38509119fa8090;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 763bf9b0..dd780699 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -65,7 +65,6 @@ if (!$valid) {
 }
 
 
-
 push @out, $self->msg('dx1', $freq) if !$valid;
 
 # check we have a callsign :-)
@@ -77,15 +76,25 @@ if ($spotted le ' ') {
 
 return (1, @out) if !$valid;
 
-# Store it here
-if (Spot::add($freq, $spotted, $main::systime, $line, $spotter)) {
-	# send orf to the users
-	my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
-	DXProt::broadcast_users($buf);
-
+# change ^ into : for transmission
+$line =~ s/\^/:/og;
 
-	# send it orf to the cluster (hang onto your tin helmets)!
-	DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+# Store it here (but only if it isn't baddx)
+if (grep $_ eq $spotted, @DXProt::baddx) {
+	my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+	push @out, $buf;
+} else {
+	my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
+	if (@spot) {
+		# send orf to the users
+		DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+		
+#		my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+#		DXProt::broadcast_users("$buf\a\a", 'dx', $spot[0]);
+
+		# send it orf to the cluster (hang onto your tin helmets) 
+#		DXProt::broadcast_all_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line), $DXProt::me);
+	}
 }
 
 return (1, @out);