X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fdx.pl;h=6e14cda5caa4d36038326085fb39b1fbd3f2e297;hb=77f4f8ef18caeb6cc96f114cc9a000bc72e19d1b;hp=fd233eb1afc55dedf78f50d0ca5e529975288c99;hpb=795ae12e4dde6a0b5848bfe3d2f3048a671c5fcd;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index fd233eb1..6e14cda5 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -33,10 +33,10 @@ if ($f[0] =~ /^by$/i) {
 }
 
 # get the freq and callsign either way round
-if ($f[0] =~ /[A-Za-z]/) {
+if (is_freq($f[1])) {
 	$spotted = uc $f[0];
 	$freq = $f[1];
-} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+} elsif (is_freq($f[0])) {
     $freq = $f[0];
 	$spotted = uc $f[1];
 } else {
@@ -103,8 +103,9 @@ 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::prepare($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);