X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=0df6891799dd8a3006da9c2a1c1880fcc16a86b6;hb=c1a9cb4e04fb7db7898b05542e671c4e9e55fb93;hp=462cb673f7fd02db3b00e6bb94a4e4a4ba9df3df;hpb=4c8be388424d403a33d72798b02e49c4f1bfd0ef;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 462cb673..0df68917 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -22,12 +22,10 @@ use QSL;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
 
-use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);
 
 $fp = undef;
 $statp = undef;
@@ -36,7 +34,8 @@ $defaultspots = 10;				# normal number of spots to return
 $maxdays = 100;				# 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
+$dupage = 1*3600;               # the length of time to hold spot dups
+$maxcalllth = 12;                               # the max length of call to take into account for dupes
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['freq', 'r', 0, 0, \&decodefreq],
@@ -102,6 +101,58 @@ sub init
 	mkdir "$dirprefix", 0777 if !-e "$dirprefix";
 	$fp = DXLog::new($dirprefix, "dat", 'd');
 	$statp = DXLog::new($dirprefix, "dys", 'd');
+
+	# load up any old spots 
+	if ($main::dbh) {
+		unless (grep $_ eq 'spot', $main::dbh->show_tables) {
+			dbg('initialising spot tables');
+			my $t = time;
+			my $total;
+			$main::dbh->spot_create_table;
+			
+			my $now = Julian::Day->alloc(1995, 0);
+			my $today = Julian::Day->new(time);
+			my $sth = $main::dbh->spot_insert_prepare;
+			$main::dbh->{RaiseError} = 0;
+			while ($now->cmp($today) <= 0) {
+				my $fh = $fp->open($now);
+				if ($fh) {
+					my $count = 0;
+					while (<$fh>) {
+						chomp;
+						my @s = split /\^/;
+						if (@s < 12) {
+							my @a = (Prefix::cty_data($s[1]))[1..3];
+							my @b = (Prefix::cty_data($s[4]))[1..3];
+							push @s, $b[1] if @s < 7;
+							push @s, '' if @s < 8;
+							push @s, @a[0,1], @b[0,1] if @s < 12;
+							push @s,  $a[2], $a[2] if @s < 14;  
+						} 
+						
+						push @s, undef while @s < 14;
+						pop @s while @s > 14;
+
+						$main::dbh->spot_insert(\@s, $sth);
+						$count++;
+					}
+					$main::dbh->commit if $count;
+					$main::dbh->{RaiseError} = 0;
+					dbg("inserted $count spots from $now->[0] $now->[1]");
+					$fh->close;
+					$total += $count;
+				}
+				$now = $now->add(1);
+			}
+			$main::dbh->spot_add_indexes;
+			$main::dbh->commit;
+			$main::dbh->{RaiseError} = 1;
+			$t = time - $t;
+			my $min = int($t / 60);
+			my $sec = $t % 60;
+			dbg("$total spots converted in $min:$sec");
+		}
+	}
 }
 
 sub prefix
@@ -116,13 +167,13 @@ sub prepare
 	my @out = @_[0..4];      # just up to the spotter
 
 	# normalise frequency
-	$_[0] = sprintf "%.1f", $_[0];
+	$out[0] = sprintf "%.1f", $out[0];
   
 	# remove ssids and /xxx if present on spotter
 	$out[4] =~ s/-\d+$//o;
 
 	# remove leading and trailing spaces
-	$_[3] = unpad($_[3]);
+	$out[3] = unpad($out[3]);
 	
 	
 	# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
@@ -136,8 +187,12 @@ sub prepare
 
 sub add
 {
-	my $buf = join("\^", @_);
+	my $buf = join('^', @_);
 	$fp->writeunix($_[2], $buf);
+	if ($main::dbh) {
+		$main::dbh->spot_insert(\@_);
+		$main::dbh->commit;
+	}
 	$totalspots++;
 	if ($_[0] <= 30000) {
 		$hfspots++;
@@ -199,6 +254,10 @@ sub search
 	
 	$to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0;
 
+	if ($main::dbh) {
+		return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan);
+	}
+
 	$expr =~ s/\$f(\d\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
   
@@ -208,6 +267,9 @@ sub search
                           my \@a = (Prefix::cty_data(\$s[1]))[1..3];
                           my \@b = (Prefix::cty_data(\$s[4]))[1..3];
                           push \@s, \@a[0,1], \@b[0,1], \$a[2], \$a[2];  
+                      } else {
+                          \$s[12] ||= ' ';
+                          \$s[13] ||= ' ';
                       }
 	                  my (\$filter, \$hops) = \$dxchan->{spotsfilter}->it(\@s);
 	                  next unless (\$filter);
@@ -294,7 +356,7 @@ sub formatl
 {
 	my $t = ztime($_[2]);
 	my $d = cldate($_[2]);
-	return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ;
+	return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
 }
 
 #
@@ -318,7 +380,7 @@ sub readfile($)
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-	my ($freq, $call, $d, $text, $by) = @_; 
+	my ($freq, $call, $d, $text, $by, $cty) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
@@ -327,29 +389,40 @@ sub dup
 	$d = int ($d / 60);
 	$d *= 60;
 
-	$freq = sprintf "%.1f", $freq;       # normalise frequency
-	$call = substr($call, 0, 12) if length $call > 12;
-
-	# quick test now for simple case
-	my $sdupkey = "X$freq|$call|$d|$by";
-	return 1 if DXDupe::find($sdupkey);
+	# remove SSID or area
+	$by =~ s|[-/]\d+$||;
 	
+#	$freq = sprintf "%.1f", $freq;       # normalise frequency
+	$freq = int $freq;       # normalise frequency
+	$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
+
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
-	$text = substr($text, 0, $duplth) if length $text > $duplth; 
-	unpad($text);
-	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
-	$text =~ s/[^a-zA-Z0-9]//g;
-	for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
-		my $dt = $d - $_;
-		my $ldupkey = "X$freq|$call|$dt|\L$text";
-		my $sdupkey = "X$freq|$call|$dt|$by";
-		return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey);
+	$text = uc unpad($text);
+	if ($cty && $text && length $text <= 4) {
+		unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) {
+			my @try = Prefix::cty_data($text);
+			$text = "" if $cty == $try[0];
+		}
 	}
-	my $ldupkey = "X$freq|$call|$d|\L$text";
-	$sdupkey = "X$freq|$call|$d|$by";
+	my $otext = $text;
+	$text =~ s/^\+\w+\s*//;			# remove leading LoTW callsign
+	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
+	$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
+	$text =~ s/[^\w]//g;
+	$text = substr($text, 0, $duplth) if length $text > $duplth; 
+	my $ldupkey = "X$freq|$call|$by|$text";
+	my $t = DXDupe::find($ldupkey);
+	return 1 if $t && $t - $main::systime > 0;
 	DXDupe::add($ldupkey, $main::systime+$dupage);
-	DXDupe::add($sdupkey, $main::systime+$dupage);
+	$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
+	$otext =~ s/\s+$//;
+	if (length $otext && $otext ne $text) {
+		$ldupkey = "X$freq|$call|$by|$otext";
+		$t = DXDupe::find($ldupkey);
+		return 1 if $t && $t - $main::systime > 0;
+		DXDupe::add($ldupkey, $main::systime+$dupage);
+	}
 	return 0;
 }