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

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 308371fd..0ebfb167 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -16,19 +16,32 @@ my $freq;
 my @out;
 my $valid = 0;
 
-# 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];
+# 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]/) {
+	$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) {
+} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+    $freq = $f[0];
+	$spotted = uc $f[1];
+} else {
 	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;
@@ -47,7 +60,7 @@ foreach $bandref (Bands::get_all()) {
 	}
 }
 
-if (!$valid) {
+unless ($valid) {
 
 	# try again in MHZ 
 	$freq = $freq * 1000 if $freq;
@@ -65,7 +78,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 ' ') {
@@ -74,7 +87,7 @@ if ($spotted le ' ') {
 	$valid = 0;
 }
 
-return (1, @out) if !$valid;
+return (1, @out) unless $valid;
 
 # change ^ into : for transmission
 $line =~ s/\^/:/og;
@@ -87,11 +100,13 @@ if (grep $_ eq $spotted, @DXProt::baddx) {
 	my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
 	if (@spot) {
 		# send orf to the users
-		my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
-		DXProt::broadcast_users($buf, 'dx', \@spot);
+		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_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line));
+#		DXProt::broadcast_all_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line), $DXProt::me);
 	}
 }