X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=0ebfb1674cf17564919eea7f243e8e259ba62315;hb=7ab17f423e9d5f27589cfe31ad962c4ea10e54f5;hp=394cb7ab6820495eaf71e72978147bdd741d9dd6;hpb=b060a0a3ee72530aa3f10d453186a662b66d7efe;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 394cb7ab..0ebfb167 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -16,17 +16,32 @@ my $freq;
 my @out;
 my $valid = 0;
 
-# first lets see if we think we have a callsign as the first argument
+# 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+//;
+    shift @f;
+	shift @f;
+	return (1, $self->msg('dx2')) unless @f >= 2;
+}
+
+# get the freq and callsign either way round
 if ($f[0] =~ /[A-Za-z]/) {
-  $spotter = uc $f[0];
-  $freq = $f[1];
-  $spotted = uc $f[2];
-  $line =~ s/^$f[0]\s+$f[1]\s+$f[2]\s*//;
+	$spotted = uc $f[0];
+	$freq = $f[1];
+} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+    $freq = $f[0];
+	$spotted = uc $f[1];
 } else {
-  $freq = $f[0];
-  $spotted = uc $f[1]; 
-  $line =~ s/^$f[0]\s+$f[1]\s*//;
+	return (1, $self->msg('dx2'));
 }
+$line =~ s/^$f[0]\s+$f[1]\s*//;
 
 # bash down the list of bands until a valid one is reached
 my $bandref;
@@ -36,21 +51,21 @@ my $i;
 # first in KHz
 L1:
 foreach $bandref (Bands::get_all()) {
-  @bb = @{$bandref->band};
-  for ($i = 0; $i < @bb; $i += 2) {
-    if ($freq >= $bb[$i] && $freq <= $bb[$i+1]) {
-	  $valid = 1;
-	  last L1;
+	@bb = @{$bandref->band};
+	for ($i = 0; $i < @bb; $i += 2) {
+		if ($freq >= $bb[$i] && $freq <= $bb[$i+1]) {
+			$valid = 1;
+			last L1;
+		}
 	}
-  }
 }
 
-if (!$valid) {
+unless ($valid) {
 
 	# try again in MHZ 
 	$freq = $freq * 1000 if $freq;
 
-L2:
+ L2:
     foreach $bandref (Bands::get_all()) {
 		@bb = @{$bandref->band};
 		for ($i = 0; $i < @bb; $i += 2) {
@@ -63,27 +78,36 @@ L2:
 }
 
 
-
-push @out, $self->msg('dx1', $freq) if !$valid;
+push @out, $self->msg('dx1', $freq) unless $valid;
 
 # check we have a callsign :-)
 if ($spotted le ' ') {
 	push @out, $self->msg('dx2');
 	
-  $valid = 0;
+	$valid = 0;
 }
 
-return (1, @out) if !$valid;
+return (1, @out) unless $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);