X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=be8be669c8d9e8899210163112c805551cb10d7b;hb=8720504a4ba0e0df8fc3932f3eb55a63decc8e9a;hp=074ae740b4aa7842b0a24ef4fa43e4cd709a9910;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 074ae740..be8be669 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
@@ -167,15 +175,15 @@ sub search
 	my $ref;
 	my $i;
 	my $count;
-	my @today = Julian::unixtoj(time());
-	my @fromdate;
-	my @todate;
+	my $today = Julian::Day->new(time());
+	my $fromdate;
+	my $todate;
 
 	$dayfrom = 0 if !$dayfrom;
 	$dayto = $maxdays unless $dayto;
 	$dayto = $dayfrom + $maxdays if $dayto < $dayfrom;
-	@fromdate = Julian::sub(@today, $dayfrom);
-	@todate = Julian::sub(@fromdate, $dayto);
+	$fromdate = $today->sub($dayfrom);
+	$todate = $fromdate->sub($dayto);
 	$from = 0 unless $from;
 	$to = $defaultspots unless $to;
 	$hint = $hint ? "next unless $hint" : "";
@@ -211,11 +219,11 @@ sub search
 	$fp->close;					# close any open files
 
 	for ($i = $count = 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 $now = $fromdate->sub($i); # but you can pick which $maxdays worth
+		last if $now->cmp($todate) <= 0;         
 	
 		my @spots = ();
-		my $fh = $fp->open(@now); # get the next file
+		my $fh = $fp->open($now); # get the next file
 		if ($fh) {
 			my $in;
 			eval $eval;			# do the search on this file
@@ -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;
@@ -279,11 +287,11 @@ sub formatl
 #
 # return all the spots from a day's file as an array of references
 # the parameter passed is a julian day
-sub readfile
+sub readfile($)
 {
 	my @spots;
 	
-	my $fh = $fp->open(@_); 
+	my $fh = $fp->open(shift); 
 	if ($fh) {
 		my $in;
 		while (<$fh>) {
@@ -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
@@ -317,11 +332,11 @@ sub listdups
 	return DXDupe::listdups('X', $dupage, @_);
 }
 
-sub genstats
+sub genstats($)
 {
-	my @date = @_;
-	my $in = $fp->open(@date);
-	my $out = $statp->open(@date, 'w');
+	my $date = shift;
+	my $in = $fp->open($date);
+	my $out = $statp->open($date, 'w');
 	my @freq = (
 				[0, Bands::get_freq('160m')],
 				[1, Bands::get_freq('80m')],
@@ -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;
@@ -367,7 +384,7 @@ sub genstats
 		for ($i = 0; $i < @freq+2; $i++) {
 			$tot[$i] ||= 0;
 		}
-		$out->write(join('^', 'TOTALS', @tot) . "\n");
+		$statp->write($date, join('^', 'TOTALS', @tot));
 
 		for (sort {$list{$b}->[0] <=> $list{$a}->[0]} keys %list) {
 			my $ref = $list{$_};
@@ -375,27 +392,26 @@ sub genstats
 			for ($i = 0; $i < @freq+2; ++$i) {
 				$ref->[$i] ||= 0;
 			}
-			$out->write(join('^', $call, @$ref) . "\n");
+			$statp->write($date, join('^', $call, @$ref));
 		}
-		$out->close;
+		$statp->close;
 	}
 }
 
 # return true if the stat file is newer than than the spot file
-sub checkstats
+sub checkstats($)
 {
-	my @date = @_;
-	my $in = $fp->mtime(@date);
-	my $out = $statp->mtime(@date);
+	my $date = shift;
+	my $in = $fp->mtime($date);
+	my $out = $statp->mtime($date);
 	return defined $out && defined $in && $out >= $in;
 }
 
 # daily processing
 sub daily
 {
-	my @date = Julian::unixtoj($main::systime);
-	@date = Julian::sub(@date, 1);
-	genstats(@date) unless checkstats(@date);
+	my $date = Julian::Day->new($main::systime)->sub(1);
+	genstats($date) unless checkstats($date);
 }
 1;