X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=362e7d5e5252d7f1502def06db8aa5a2a630bc6c;hb=512ad102c88b3bd56a3435c72ad5288822af20fa;hp=c2917e2e69b52194afa4fa91374835daa855b96c;hpb=9c23c26e9c317f924994e1fead122708d3369091;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index c2917e2e..362e7d5e 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -8,14 +8,13 @@
 
 package Spot;
 
-use FileHandle;
+use IO::File;
 use DXVars;
 use DXDebug;
 use DXUtil;
 use DXLog;
 use Julian;
 use Prefix;
-use Carp;
 
 use strict;
 use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix);
@@ -29,7 +28,7 @@ $dirprefix = "spots";
 sub init
 {
 	mkdir "$dirprefix", 0777 if !-e "$dirprefix";
-	$fp = DXLog::new($dirprefix, "dat", 'd')
+	$fp = DXLog::new($dirprefix, "dat", 'd');
 }
 
 sub prefix
@@ -69,7 +68,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 +82,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 <n> days less than today to <m> days less than today
@@ -102,7 +104,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 +139,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;