X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FQSL.pm;h=0df7570ba24f615ac1fccce38cde2d59955588ca;hb=refs%2Fheads%2Fnewdisc;hp=3fab28627d66efa4014adc628332dfd7496dbf0f;hpb=73edaec40b921e6e932b2fb873f2d6ce381d1d92;p=spider.git

diff --git a/perl/QSL.pm b/perl/QSL.pm
index 3fab2862..0df7570b 100644
--- a/perl/QSL.pm
+++ b/perl/QSL.pm
@@ -12,24 +12,35 @@ use DXVars;
 use DXUtil;
 use DB_File;
 use DXDebug;
-use Storable qw(nfreeze thaw);
+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;
+
+localdata_mv("$qslfn.v1");
 
 sub init
 {
 	my $mode = shift;
-	my $ufn = "$main::root/data/$qslfn.v1";
+	my $ufn = localdata("$qslfn.v1");
+
+	Prefix::load() unless Prefix::loaded();
 	
+	eval {
+		require Storable;
+	};
+	
+	if ($@) {
+		dbg("Storable appears to be missing");
+		dbg("In order to use the QSL feature you must");
+		dbg("load Storable from CPAN");
+		return undef;
+	}
+	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 {
@@ -49,36 +60,61 @@ sub new
 	return bless [uc $call, []], $pkg;
 }
 
-# the format of each entry is [manager, times found, last time]
+# called $self->update(comment, time, spotter)
+# $self has the callsign as the first argument in an array of array references
+# the format of each entry is [manager, times found, last time, last reporter]
 sub update
 {
+	return unless $dbm;
 	my $self = shift;
 	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];
-			push @{$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
 {
-	my $key = uc shift;
 	return undef unless $dbm;
+	my $key = uc shift;
 	my $value;
 	
 	my $r = $dbm->get($key, $value);
@@ -88,6 +124,7 @@ sub get
 
 sub put
 {
+	return unless $dbm;
 	my $self = shift;
 	my $key = $self->[0];
 	my $value = nfreeze($self);