X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=85dc4cf91f47aba2df092596b78eca31b2d218f5;hb=f9b0d39eb17d107b9f2b0c6c08652ea02c1d74ce;hp=3f366dffb20f82ef5bb508c370b55f836066ce9e;hpb=8e0eef80216fbb2bca3606daf5797e39b2889d7a;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 3f366dff..85dc4cf9 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -33,14 +33,14 @@ if ($f[0] =~ /^by$/i) {
 }
 
 # get the freq and callsign either way round
-if ($f[0] =~ /[A-Za-z]/) {
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
 	$spotted = uc $f[0];
 	$freq = $f[1];
-} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+} 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('dx2'));
+	return (1, $self->msg('dx3'));
 }
 
 # make line the rest of the line
@@ -103,9 +103,13 @@ if (grep $_ eq $spotted, @DXProt::baddx) {
 	my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
 	push @out, $buf;
 } else {
-	return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, (int ($main::systime/60)) * 60, $line);
-	my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
+	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 orf to the users
 		DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
 	}