package Spot;
-use FileHandle;
+use IO::File;
use DXVars;
use DXDebug;
use DXUtil;
# 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 (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
}
# search the spot database for records based on the field no and an expression
# $f2 = date in unix format
# $f3 = comment
# $f4 = spotter
-# $f5 = dxcc country
+# $f5 = spotted dxcc country
+# $f6 = spotter dxcc country
+# $f7 = origin
+#
#
# In addition you can specify a range of days, this means that it will start searching
# from <n> days less than today to <m> days less than today
my $ref;
my $i;
my $count;
- my @today = Julian::unixtoj(time);
+ my @today = Julian::unixtoj(time());
my @fromdate;
my @todate;
$fp->close; # close any open files
- for ($i = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
+ for ($i = $count = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
my @now = Julian::sub(@fromdate, $i); # but you can pick which $maxdays worth
last if Julian::cmp(@now, @todate) <= 0;