some detail changes in the send routines and spot formatting

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 167671ddab31f169db4edbbb0f90b1c53aec6a9a..d5b5adf93994ef4aa6f5fba77689268feff524c3 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -11,6 +11,7 @@ package Spot;
 use FileHandle;
 use DXVars;
 use DXDebug;
+use DXUtil;
 use Julian;
 use Prefix;
 use Carp;
@@ -18,12 +19,13 @@ use Carp;
 @ISA = qw(Julian);
 
 use strict;
+use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix);
 
-my $fp;
-my $maxspots = 50;      # maximum spots to return
-my $defaultspots = 10;    # normal number of spots to return
-my $maxdays = 35;        # normal maximum no of days to go back
-my $dirprefix = "$main::data/spots";
+$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";
 
 sub prefix
 {
@@ -54,7 +56,10 @@ sub add
   my @dxcc = Prefix::extract($spot[1]);
   push @spot, (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0;
 
-  $fh->print(join("\^", @spot), "\n");
+  my $buf = join("\^", @spot);
+  $fh->print($buf, "\n");
+  
+  return $buf;
 }
 
 # search the spot database for records based on the field no and an expression
@@ -109,17 +114,25 @@ sub search
        $to = $defaultspots;
   }
 
-  $expr =~ s/\$f(\d)/zzzref->[$1]/g;               # swap the letter n for the correct field name
-  $expr =~ s/[\@\$\%\{\}]//g;                           # remove any other funny characters
-  $expr =~ s/\&\w+\(//g;                           # remove subroutine calls
-  $expr =~ s/eval//g;                              # remove eval words
-  $expr =~ s/zzzref/\$ref/g;                       # put back the $ref
-  $expr =~ s|(/.+/)|$1oi|g;                        # add oi characters to /ccc/
+  $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
   
-  print "expr=($expr), from=$from, to=$to\n";
+  dbg("search", "expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n");
   
   # build up eval to execute
-  $eval = qq(my \$c;
+  $eval = qq(
+#    while (<\$fh>) {
+#        chomp;
+#        my \@spots = split /\\^/o;
+#        if ($expr) {                # note NO \$expr
+#          \$count++;
+#              next if \$count < \$from;                  # wait until from 
+#              push(\@out, \\\@spots);
+#              last LOOP if \$count >= \$to;                  # stop after to
+#        }
+#      }
+    my \$c;
+       my \$ref;
     for (\$c = \$#spots; \$c >= 0; \$c--) {
          \$ref = \$spots[\$c];
          if ($expr) {
@@ -128,11 +141,12 @@ sub search
         push(\@out, \$ref);
                last LOOP if \$count >= \$to;                  # stop after to
          }
-  });
+    }
+  );
 
 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 = ();
@@ -142,11 +156,10 @@ LOOP:
          my $in;
          foreach $in (<$fh>) {
            chomp $in;
-        push @spots, [ split('\^', $in) ];
+       push @spots, [ split('\^', $in) ];
          }
-         my $ref;
          eval $eval;               # do the search on this file
-         return ("error", $@) if $@;
+         return ("Spot search error", $@) if $@;
        }
   }
 
@@ -166,4 +179,21 @@ sub close
   # do nothing, unreferencing or overwriting the $self will close it  
 }
 
+# format a spot for user output in 'broadcast' mode
+sub formatb
+{
+  my @dx = @_;
+  my $t = ztime($dx[2]);
+  return sprintf "DX de %-7.7s: %13.1f %-12.12s %-30s<%s>", $dx[4], $dx[0], $dx[1], $dx[3], $t ;
+}
+
+# format a spot for user output in list mode
+sub formatl
+{
+  my @dx = @_;
+  my $t = ztime($dx[2]);
+  my $d = cldate($dx[2]);
+  return sprintf "%9.1f %-12s %s %s %-30s<%s>", $dx[0], $dx[1], $d, $t, $dx[3], $dx[4] ;
+}
+
 1;