projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added DK0WCY-3 WWV announce beacon parsing into local WWV file
[spider.git]
/
perl
/
Spot.pm
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 3bc643cbb668b89c3340acaba70104e108ca655d..cdd7393d21803c8f85931cf525e79664bec6eb89 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-8,7
+8,7
@@
package Spot;
package Spot;
-use
FileHand
le;
+use
IO::Fi
le;
use DXVars;
use DXDebug;
use DXUtil;
use DXVars;
use DXDebug;
use DXUtil;
@@
-52,9
+52,15
@@
sub add
# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
my @dxcc = Prefix::extract($out[1]);
# 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]);
@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);
push @out, $spot[5];
my $buf = join("\^", @out);
@@
-63,7
+69,7
@@
sub add
# automagically closes the output file (if any)).
$fp->writeunix($out[2], $buf);
# 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
}
# search the spot database for records based on the field no and an expression
@@
-77,7
+83,10
@@
sub add
# $f2 = date in unix format
# $f3 = comment
# $f4 = spotter
# $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
#
# 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
@@
-96,7
+105,7
@@
sub search
my $ref;
my $i;
my $count;
my $ref;
my $i;
my $count;
- my @today = Julian::unixtoj(time);
+ my @today = Julian::unixtoj(time
()
);
my @fromdate;
my @todate;
my @fromdate;
my @todate;
@@
-131,7
+140,7
@@
sub search
$fp->close; # close any open files
$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;
my @now = Julian::sub(@fromdate, $i); # but you can pick which $maxdays worth
last if Julian::cmp(@now, @todate) <= 0;