added logging

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 08520c5b47f1108ec26d33d7195372d089cb0dca..e53880e1d48f6db0070a35d7482b03821809ff24 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -11,12 +11,12 @@ package Spot;
 use FileHandle;
 use DXVars;
 use DXDebug;
+use DXUtil;
+use DXLog;
 use Julian;
 use Prefix;
 use Carp;
 
-@ISA = qw(Julian);
-
 use strict;
 use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix);
 
@@ -24,11 +24,17 @@ $fp = undef;
 $maxspots = 50;      # maximum spots to return
 $defaultspots = 10;    # normal number of spots to return
 $maxdays = 35;        # normal maximum no of days to go back
-$dirprefix = "$main::data/spots";
+$dirprefix = "spots";
+
+sub init
+{
+       mkdir "$dirprefix", 0777 if !-e "$dirprefix";
+       $fp = DXLog::new($dirprefix, "dat", 'd')
+}
 
 sub prefix
 {
-  return $dirprefix;
+  return $fp->{prefix};
 }
 
 # add a spot to the data file (call as Spot::add)
@@ -43,19 +49,17 @@ sub add
   # remove ssid if present on spotter
   $spot[4] =~ s/-\d+$//o;
 
-  # compare dates to see whether need to open another save file (remember, redefining $fp 
-  # automagically closes the output file (if any))
-  my @date = Julian::unixtoj($spot[2]);
-  $fp = Spot->open(@date, ">>") if (!$fp || Julian::cmp(@date, $fp->{year}, $fp->{day}));
-
-  # save it
-  my $fh = $fp->{fh};
-
   # add the 'dxcc' country on the end
   my @dxcc = Prefix::extract($spot[1]);
   push @spot, (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0;
 
-  $fh->print(join("\^", @spot), "\n");
+  my $buf = join("\^", @spot);
+
+  # compare dates to see whether need to open another save file (remember, redefining $fp 
+  # automagically closes the output file (if any)). 
+  $fp->writeunix($spot[2], $buf);
+  
+  return $buf;
 }
 
 # search the spot database for records based on the field no and an expression
@@ -111,11 +115,14 @@ sub search
   }
 
   $expr =~ s/\$f(\d)/\$ref->[$1]/g;               # swap the letter n for the correct field name
+#  $expr =~ s/\$f(\d)/\$spots[$1]/g;               # swap the letter n for the correct field name
   
   dbg("search", "expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n");
   
   # build up eval to execute
-  $eval = qq(my \$c;
+  $eval = qq(
+    my \$c;
+       my \$ref;
     for (\$c = \$#spots; \$c >= 0; \$c--) {
          \$ref = \$spots[\$c];
          if ($expr) {
@@ -124,42 +131,47 @@ sub search
         push(\@out, \$ref);
                last LOOP if \$count >= \$to;                  # stop after to
          }
-  });
+    }
+  );
+
+  $fp->close;                                      # close any open files
 
 LOOP:
-  for ($i = 0; $i < 60; ++$i) {
-    my @now = Julian::sub(@fromdate, $i);
+  for ($i = 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 @spots = ();
-       my $fp = Spot->open(@now);  # get the next file
-       if ($fp) {
-         my $fh = $fp->{fh};
+       my $fh = $fp->open(@now);  # get the next file
+       if ($fh) {
          my $in;
-         foreach $in (<$fh>) {
-           chomp $in;
-        push @spots, [ split('\^', $in) ];
+         while (<$fh>) {
+                 chomp;
+                 push @spots, [ split '\^' ];
          }
-         my $ref;
          eval $eval;               # do the search on this file
-         return ("error", $@) if $@;
+         return ("Spot search error", $@) if $@;
        }
   }
 
   return @out;
 }
 
-# open a spot file of the Julian day
-sub open
+# format a spot for user output in 'broadcast' mode
+sub formatb
 {
-  my $pkg = shift;
-  return Julian::open("spot", $dirprefix, @_);
+  my @dx = @_;
+  my $t = ztime($dx[2]);
+  return sprintf "DX de %-7.7s%11.1f  %-12.12s %-30s %s", "$dx[4]:", $dx[0], $dx[1], $dx[3], $t ;
 }
 
-# close a spot file
-sub close
+# format a spot for user output in list mode
+sub formatl
 {
-  # do nothing, unreferencing or overwriting the $self will close it  
-}
+  my @dx = @_;
+  my $t = ztime($dx[2]);
+  my $d = cldate($dx[2]);
+  return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $dx[0], $dx[1], $d, $t, $dx[3], "<$dx[4]" ;
+} 
 
 1;