Fix a couple of typos in the help files for BADDX and BADSPOTTER

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index c9178ddb13b3f8668d25676544d69a6365218512..57cf2599a103e0c71d310da69487144387898ddb 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -23,13 +23,14 @@ use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $fil
 $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
+$maxdays = 3*31;                               # normal maximum no of days to go back
 $dirprefix = "spots";
 $duplth = 20;                                  # the length of text to use in the deduping
 $dupage = 3*3600;               # the length of time to hold spot dups
 $filterdef = bless ([
                          # tag, sort, field, priv, special parser 
                          ['freq', 'r', 0, 0, \&decodefreq],
+                         ['on', 'r', 0, 0, \&decodefreq],
                          ['call', 'c', 1],
                          ['info', 't', 3],
                          ['by', 'c', 4],
@@ -44,6 +45,14 @@ $filterdef = bless ([
                         ], 'Filter::Cmd');
 
 
+# create a Spot Object
+sub new
+{
+       my $class = shift;
+       my $self = [ @_ ];
+       return bless $self, $class;
+}
+
 sub decodefreq
 {
        my $dxchan = shift;
@@ -53,14 +62,18 @@ sub decodefreq
        my $f;
        
        foreach $f (@f) {
-               my ($a, $b) = $f =~ m{^(\d+)/(\d+)$};
-               if ($a && $b) {
-                       push @out, $a, $b;
+               my ($a, $b); 
+               if (m{^\d+/\d+$}) {
+                       push @out, $f;
                } elsif (($a, $b) = $f =~ m{^(\w+)(?:/(\w+))?$}) {
                        $b = lc $b if $b;
                        my @fr = Bands::get_freq(lc $a, $b);
                        if (@fr) {
-                               push @out, @fr;    # add these to the list
+                               while (@fr) {
+                                       $a = shift @fr;
+                                       $b = shift @fr;
+                                       push @out, "$a/$b";  # add them as ranges
+                               }
                        } else {
                                return ('dfreq', $dxchan->msg('dfreq1', $f));
                        }
@@ -109,7 +122,7 @@ sub add
        my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
        push @out, $spotter_dxcc;
        push @out, $spot[5];
-       
+
        my $buf = join("\^", @out);
 
        # compare dates to see whether need to open another save file (remember, redefining $fp 
@@ -146,7 +159,7 @@ sub add
 
 sub search
 {
-       my ($expr, $dayfrom, $dayto, $from, $to) = @_;
+       my ($expr, $dayfrom, $dayto, $from, $to, $hint) = @_;
        my $eval;
        my @out;
        my $ref;
@@ -162,16 +175,23 @@ sub search
        @todate = Julian::sub(@fromdate, $dayto);
        $from = 0 unless $from;
        $to = $defaultspots unless $to;
+       $hint = $hint ? "next unless $hint" : "";
+       $expr = "1" unless $expr;
        
        $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0;
 
        $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");
+       dbg("search", "hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n");
   
        # build up eval to execute
        $eval = qq(
+                          while (<\$fh>) {
+                                  $hint;
+                                  chomp;
+                                  push \@spots, [ split '\\^' ];
+                          }
                           my \$c;
                           my \$ref;
                           for (\$c = \$#spots; \$c >= 0; \$c--) {
@@ -195,10 +215,6 @@ sub search
                my $fh = $fp->open(@now); # get the next file
                if ($fh) {
                        my $in;
-                       while (<$fh>) {
-                               chomp;
-                               push @spots, [ split '\^' ];
-                       }
                        eval $eval;                     # do the search on this file
                        last if $count >= $to; # stop after to
                        return ("Spot search error", $@) if $@;
@@ -208,6 +224,35 @@ sub search
        return @out;
 }
 
+# change a freq range->regular expression
+sub ftor
+{
+       my ($a, $b) = @_;
+       return undef unless $a < $b;
+       $b--;
+       my $d = $b - $a;
+       my @a = split //, $a;
+       my @b = split //, $b;
+       my $out;
+       while (@b > @a) {
+               $out .= shift @b;
+       }
+       while (@b) {
+               my $aa = shift @a;
+               my $bb = shift @b;
+               if (@b < (length $d) - 1) {
+                       $out .= '\\d';
+               } elsif ($aa eq $bb) {
+                       $out .= $aa;
+               } elsif ($aa < $bb) {
+                       $out .= "[$aa-$bb]";
+               } else {
+                       $out .= "[0-$bb$aa-9]";
+               }
+       }
+       return $out;
+}
+
 # format a spot for user output in 'broadcast' mode
 sub formatb
 {
@@ -258,6 +303,7 @@ sub dup
        chomp $text;
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
        unpad($text);
+       $text =~ s/[\\\%]\d+//g;
        $text =~ s/[^a-zA-Z0-9]//g;
        my $dupkey = "X$freq|$call|$d|\L$text";
        return DXDupe::check($dupkey, $main::systime+$dupage);