X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;fp=cmd%2Fdx.pl;h=9a9aff7108a2c58b0b9f079702d4650effd5b982;hb=5b3c2c5e342c23fbab96b7573c5963344617878f;hp=02fc3ca448604706d3ecd06996027faf155bfe24;hpb=ee2b26cea53095199ebd04c4977ede501981af1c;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 02fc3ca4..9a9aff71 100644 --- a/cmd/dx.pl +++ b/cmd/dx.pl @@ -104,8 +104,9 @@ return (1, @out) unless $valid; # Store it here (but only if it isn't baddx) my $t = (int ($main::systime/60)) * 60; -return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter); my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall); +my $thing = Thingy::Dx->new(origin=>$main::mycall, group=>'DX', user=>$spotter); +$thing->from_DXProt(spotdata=>\@spot); if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) { @@ -113,19 +114,10 @@ if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) { if ($freq =~ /^69/) { $self->badcount(($self->badcount||0) + 1); } - - $self->dx_spot(undef, undef, @spot); - return (1); } else { - if (@spot) { - # store it - Spot::add(@spot); - - # send orf to the users - DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot); - } + $thing->queue($self); } - +push @out, $thing->gen_DXCommandmode($self); return (1, @out);