X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=11ffdfa41344254622620ecd9492e0e2941cff8b;hb=85f715f5353a78bac85f1802c22d6e7b9352ca81;hp=f8925d3d51b33d2bcf63bfe2fffc120c5c7816bd;hpb=f0910da57e166acb22e83de4e4b771d175074c80;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index f8925d3d..11ffdfa4 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -19,6 +19,13 @@ use DXDupe;
 use Data::Dumper;
 
 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
 
 $fp = undef;
@@ -90,7 +97,8 @@ sub init
 {
 	mkdir "$dirprefix", 0777 if !-e "$dirprefix";
 	$fp = DXLog::new($dirprefix, "dat", 'd');
-	$statp = DXLog::new($dirprefix, "bys", 'd');
+	$statp = DXLog::new($dirprefix, "cys", 'd');
+	system("rm -f $main::data/$dirprefix/2001/*.bys");
 }
 
 sub prefix
@@ -243,7 +251,7 @@ sub ftor
 	while (@b) {
 		my $aa = shift @a;
 		my $bb = shift @b;
-		if (@b < (length $d) - 1) {
+		if (@b < (length $d)) {
 			$out .= '\\d';
 		} elsif ($aa eq $bb) {
 			$out .= $aa;
@@ -304,12 +312,19 @@ sub dup
  
 	$freq = sprintf "%.1f", $freq;       # normalise frequency
 	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 =~ s/[\\\%]\d+//g;
+	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
 	$text =~ s/[^a-zA-Z0-9]//g;
+	for (0,60,120,180,240,300) {
+		my $dt = $d - $_;
+		my $dupkey = "X$freq|$call|$dt|\L$text";
+		return 1 if DXDupe::find($dupkey);
+	}
 	my $dupkey = "X$freq|$call|$d|\L$text";
-	return DXDupe::check($dupkey, $main::systime+$dupage);
+	DXDupe::add($dupkey, $main::systime+$dupage);
+	return 0;
 }
 
 sub listdups
@@ -335,13 +350,15 @@ sub genstats($)
 				[9, Bands::get_freq('6m')],
 				[10, Bands::get_freq('4m')],
 				[11, Bands::get_freq('2m')],
-				[12, Bands::get_freq('70cm')],
-				[13, Bands::get_freq('13cm')],
-				[14, Bands::get_freq('9cm')],
-				[15, Bands::get_freq('6cm')],
-				[16, Bands::get_freq('3cm')],
-				[17, Bands::get_freq('12mm')],
-				[18, Bands::get_freq('6cm')],
+				[12, Bands::get_freq('220')],
+				[13, Bands::get_freq('70cm')],
+				[14, Bands::get_freq('23cm')],
+				[15, Bands::get_freq('13cm')],
+				[16, Bands::get_freq('9cm')],
+				[17, Bands::get_freq('6cm')],
+				[18, Bands::get_freq('3cm')],
+				[19, Bands::get_freq('12mm')],
+				[20, Bands::get_freq('6cm')],
 			   );
 	my %list;
 	my @tot;