X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=cdd7393d21803c8f85931cf525e79664bec6eb89;hb=d8187e68f181966eea2dca949ca13e2cbbaf072e;hp=c2917e2e69b52194afa4fa91374835daa855b96c;hpb=9c23c26e9c317f924994e1fead122708d3369091;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index c2917e2e..cdd7393d 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -8,7 +8,7 @@ package Spot; -use FileHandle; +use IO::File; use DXVars; use DXDebug; use DXUtil; @@ -69,7 +69,7 @@ sub add # automagically closes the output file (if any)). $fp->writeunix($out[2], $buf); - return ($buf, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq); + return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq); } # search the spot database for records based on the field no and an expression @@ -83,7 +83,10 @@ sub add # $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 days less than today to days less than today @@ -102,7 +105,7 @@ sub search my $ref; my $i; my $count; - my @today = Julian::unixtoj(time); + my @today = Julian::unixtoj(time()); my @fromdate; my @todate; @@ -137,7 +140,7 @@ sub search $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;