X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FQSL.pm;h=3d228d39685992166ec292c8b42a3c221b362ec4;hb=770092d94f96b6d22a38fb33e0056b4779a8a1ab;hp=abb8b86cf6a771e850f1532195b3fef246144146;hpb=db4b52547dcfe1b83ce865aeb2c53a0ad68acdb3;p=spider.git

diff --git a/perl/QSL.pm b/perl/QSL.pm
index abb8b86c..3d228d39 100644
--- a/perl/QSL.pm
+++ b/perl/QSL.pm
@@ -12,22 +12,20 @@ use DXVars;
 use DXUtil;
 use DB_File;
 use DXDebug;
+use Prefix;
 
-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($qslfn $dbm);
+use vars qw($qslfn $dbm $maxentries);
 $qslfn = 'qsl';
 $dbm = undef;
+$maxentries = 50;
 
 sub init
 {
 	my $mode = shift;
 	my $ufn = "$main::root/data/$qslfn.v1";
 
+	Prefix::load() unless Prefix::loaded();
+	
 	eval {
 		require Storable;
 	};
@@ -38,8 +36,9 @@ sub init
 		dbg("load Storable from CPAN");
 		return undef;
 	}
-	import Storable qw(nfreeze thaw);
+	import Storable qw(nfreeze freeze thaw);
 	my %u;
+	undef $dbm;
 	if ($mode) {
 		$dbm = tie (%u, 'DB_File', $ufn, O_CREAT|O_RDWR, 0666, $DB_BTREE) or confess "can't open qsl file: $qslfn ($!)";
 	} else {
@@ -59,7 +58,7 @@ sub new
 	return bless [uc $call, []], $pkg;
 }
 
-# the format of each entry is [manager, times found, last time]
+# the format of each entry is [manager, times found, last time, last reporter]
 sub update
 {
 	return unless $dbm;
@@ -67,23 +66,45 @@ sub update
 	my $line = shift;
 	my $t = shift;
 	my $by = shift;
+	my $changed;
+
+	return unless length $line && $line =~ /\b(?:QSL|VIA)\b/i;
+	foreach my $man (split /\b/, uc $line) {
+		my $tok;
 		
-	my @tok = map {/^BUR/ || is_callsign($_) ? $_ : ()} split(/\b/, uc $line);
-	foreach my $man (@tok) {
-		$man = 'BUREAU' if $man =~ /^BUR/;
-		my ($r) = grep {$_->[0] eq $man} @{$self->[1]};
-		if ($r) {
-			$r->[1]++;
-			if ($t > $r->[2]) {
-				$r->[2] = $t;
-				$r->[3] = $by;
-			}
+		if (is_callsign($man) && !is_qra($man)) {
+			my @pre = Prefix::extract($man);
+			$tok = $man if @pre && $pre[0] ne 'Q';
+		} elsif ($man =~ /^BUR/) {
+			$tok = 'BUREAU';
+		} elsif ($man =~ /^LOTW/) {
+			$tok = 'LOTW';
+		} elsif ($man eq 'HC' || $man =~ /^HOM/ || $man =~ /^DIR/) {
+			$tok = 'HOME CALL';
+		} elsif ($man =~ /^QRZ/) {
+			$tok = 'QRZ.com';
 		} else {
-			$r = [$man, 1, $t, $by];
-			unshift @{$self->[1]}, $r;
+			next;
+		}
+		if ($tok) {
+			my ($r) = grep {$_->[0] eq $tok} @{$self->[1]};
+			if ($r) {
+				$r->[1]++;
+				if ($t > $r->[2]) {
+					$r->[2] = $t;
+					$r->[3] = $by;
+				}
+				$changed++;
+			} else {
+				$r = [$tok, 1, $t, $by];
+				unshift @{$self->[1]}, $r;
+				$changed++;
+			}
+			# prune the number of entries
+			pop @{$self->[1]} while (@{$self->[1]} > $maxentries);
 		}
 	}
-	$self->put;
+	$self->put if $changed;
 }
 
 sub get
@@ -94,9 +115,17 @@ sub get
 	
 	my $r = $dbm->get($key, $value);
 	return undef if $r;
-	return thaw($value);
+	my $v;
+	eval { $v = thaw($value) };
+	if ($@) {
+		LogDbg("Error thawing DXQSL key '$key' (now deleted): $@");
+		eval {$dbm->del($key)};
+		return undef;
+	}
+	return $v;
 }
 
+
 sub put
 {
 	return unless $dbm;
@@ -106,4 +135,9 @@ sub put
 	$dbm->put($key, $value);
 }
 
+sub active
+{
+	return $dbm;
+}
+
 1;