X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=c2917e2e69b52194afa4fa91374835daa855b96c;hb=8ac487c0c3297023df07493b11fe166d4c857081;hp=efdf16ed4edcb3947ca144103c49f7da84db66f8;hpb=f3adc82a0299652d929b73c718127fa38571eec5;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index efdf16ed..c2917e2e 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -52,19 +52,24 @@ sub add # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call my @dxcc = Prefix::extract($out[1]); - push @out, (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; + my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; + my $spotted_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0; + my $spotted_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0; + push @out, $spotted_dxcc; @dxcc = Prefix::extract($out[4]); - push @out, (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; + my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; + my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0; + my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0; + push @out, $spotter_dxcc; push @out, $spot[5]; - my $buf = join("\^", @out); # compare dates to see whether need to open another save file (remember, redefining $fp # automagically closes the output file (if any)). $fp->writeunix($out[2], $buf); - return $buf; + return ($buf, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq); } # search the spot database for records based on the field no and an expression