merge various things from master

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 92ce5249051480710fe009aeb1c81feab51bbb28..f4b5f3cd9e7b55c56acb532797aa631cc4b0ee06 100644 (file)
--- 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);
@@ -502,9 +501,9 @@ sub dup
        $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
        $text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure!
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
-       my $ldupkey = "X$|$call|$by|$node|$freq|$d||$text";
+       my $ldupkey = "X$|$call|$by|$node|$freq|$d|$text";
        my $t = DXDupe::find($ldupkey);
-       return $ldupkey if $t && $t - $main::systime > 0;
+       return 1 if $t && $t - $main::systime > 0;
        
        DXDupe::add($ldupkey, $main::systime+$dupage);
        $otext = substr($otext, 0, $duplth) if length $otext > $duplth;