X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=73ba0de0e4275dd74d11d4c63f06244146673786;hb=2bc468970b9ad5fa455e100688cbdd6ab8885edc;hp=b80d89bffb0404cafa226c3b059ac424c44ea988;hpb=15424b325766c68bc04207c71dbaf86f06ca5ffa;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index b80d89bf..73ba0de0 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -9,27 +9,51 @@
 #
 
 my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split /\s+/, $line, 3;
 my $spotter = $self->call;
 my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+return (1, $self->msg('e5')) if $self->remotecmd;
 
-# first lets see if we think we have a callsign as the first argument
-if (defined @f && @f >= 3 && $f[0] =~ /[A-Za-z]/) {
-	$spotter = uc $f[0];
+my @bad;
+if (@bad = BadWords::check($line)) {	
+	$self->badcount(($self->badcount||0) + @bad);
+	return (1, $self->msg('e17', @bad));
+}
+
+# do we have at least two args?
+return (1, $self->msg('dx2')) unless @f >= 2;
+
+# as a result of a suggestion by Steve K9AN, I am changing the syntax of
+# 'spotted by' things to "dx by g1tlh <freq> <call>" <freq> and <call>
+# can be in any order
+
+if ($f[0] =~ /^by$/i) {
+    $spotter = uc $f[1];
+    $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+	$line = $f[2];
+	@f = split /\s+/, $line;
+	return (1, $self->msg('dx2')) unless @f >= 2;
+}
+
+# get the freq and callsign either way round
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
+	$spotted = uc $f[0];
 	$freq = $f[1];
-	$spotted = uc $f[2];
-	$line =~ s/^$f[0]\s+$f[1]\s+$f[2]\s*//;
-} elsif (defined @f && @f >= 2) {
-	$freq = $f[0];
-	$spotted = uc $f[1]; 
-	$line =~ s/^$f[0]\s+$f[1]\s*//;
-} elsif (!defined @f || @f < 2) {
-	return (1, $self->msg('dx2'));
+} elsif (is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
+    $freq = $f[0];
+	$spotted = uc $f[1];
+} else {
+	return (1, $self->msg('dx3'));
 }
 
+
+# make line the rest of the line
+$line = $f[2] || " ";
+@f = split /\s+/, $line;
+
 # bash down the list of bands until a valid one is reached
 my $bandref;
 my @bb;
@@ -47,7 +71,7 @@ foreach $bandref (Bands::get_all()) {
 	}
 }
 
-if (!$valid) {
+unless ($valid) {
 
 	# try again in MHZ 
 	$freq = $freq * 1000 if $freq;
@@ -65,8 +89,7 @@ if (!$valid) {
 }
 
 
-
-push @out, $self->msg('dx1', $freq) if !$valid;
+push @out, $self->msg('dx1', $freq) unless $valid;
 
 # check we have a callsign :-)
 if ($spotted le ' ') {
@@ -75,24 +98,35 @@ if ($spotted le ' ') {
 	$valid = 0;
 }
 
-return (1, @out) if !$valid;
+return (1, @out) unless $valid;
 
-# change ^ into : for transmission
-$line =~ s/\^/:/og;
 
 # 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);
+if ($DXProt::baddx->in($spotted) || $freq =~ /^69/) {
+
+	# heaven forfend that we get a 69Mhz band :-)
+	if ($freq =~ /^69/) {
+		$self->badcount(($self->badcount||0) + 1);
+	}
+
+	my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
 	push @out, $buf;
 } else {
-	if (Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall)) {
-		# send orf to the users
-		my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
-		DXProt::broadcast_users($buf, 'dx', $buf);
+	my $t = (int ($main::systime/60)) * 60;
+	return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line);
+	my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+	if (@spot) {
+		# store it 
+		Spot::add(@spot);
 
-		# send it orf to the cluster (hang onto your tin helmets) 
-		DXProt::broadcast_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+		# send orf to the users
+		DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
 	}
 }
 
 return (1, @out);
+
+
+
+
+