X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=bda988f8657bd684975c406db3b7a423b73c9435;hb=400227d4bd709387099bf224b1c00a6f988c8196;hp=852a3bda04d9145cb406c799bdc78c3d4b264650;hpb=b29626c537438016f7221c667628d5e49b9f4fce;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 852a3bda..bda988f8 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -238,10 +238,9 @@ sub prepare # remove ssids and /xxx if present on spotter $out[4] =~ s/-\d+$//o; - # remove leading and trailing spaces + # remove leading and trailing spaces from comment field $out[3] = unpad($out[3]); - # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call my @spd = Prefix::cty_data($out[1]); push @out, $spd[0]; @@ -348,6 +347,7 @@ sub search dbg("Spot::search hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search'); # build up eval to execute + dbg("Spot::search Spot eval: $expr") if isdbg('searcheval'); $expr =~ s/\$r/\$_[0]/g; my $eval = qq{ sub { return $expr; } }; @@ -355,7 +355,6 @@ sub search my $ecode = eval $eval; return ("Spot search error", $@) if $@; - my $fh; my $now = $fromdate; my $today = Julian::Day->new($main::systime); @@ -523,11 +522,11 @@ sub listdups return DXDupe::listdups('X', $dupage, @_); } -sub genstats($) +sub genstats { my $date = shift; - my $in = $fp->open($date); - my $out = $statp->open($date, 'w'); + my $in = $fp->open($date) or dbg("Spot::genstats: Cannot open " . $fp->fn($date) . " $!"); + my $out = $statp->open($date, 'w') or dbg("Spot::genstats: Cannot open " . $statp->fn($date) . " $!"); my @freq; my %list; my @tot; @@ -570,7 +569,7 @@ sub genstats($) } # return true if the stat file is newer than than the spot file -sub checkstats($) +sub checkstats { my $date = shift; my $in = $fp->mtime($date);