X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FQSL.pm;h=ec5512216f563ffe9929bad57253d9d87851799f;hb=refs%2Fheads%2Fstaging;hp=20d5c6143f139e656ab3a4c325fa7a1872fa78da;hpb=75987f0dbcbba4fc2bb5a378d14e2fbdb2e30e34;p=spider.git

diff --git a/perl/QSL.pm b/perl/QSL.pm
index 20d5c614..ec551221 100644
--- a/perl/QSL.pm
+++ b/perl/QSL.pm
@@ -8,35 +8,35 @@
 package QSL;
 
 use strict;
-use DXVars;
+use SysVar;
 use DXUtil;
 use DB_File;
 use DXDebug;
 use Prefix;
+use DXJSON;
+use Data::Structure::Util qw(unbless);
 
-use vars qw($qslfn $dbm);
-$qslfn = 'qsl';
+use vars qw($qslfn $dbm $maxentries);
+$qslfn = 'dxqsl';
 $dbm = undef;
+$maxentries = 50;
+
+my %u;
+my $json;
+
+localdata_mv("$qslfn.v1j");
 
 sub init
 {
 	my $mode = shift;
-	my $ufn = "$main::root/data/$qslfn.v1";
+	my $ufn = localdata("$qslfn.v1j");
 
-	Prefix::load() unless Prefix::loaded();
+	$json = DXJSON->new;
 	
-	eval {
-		require Storable;
-	};
+	Prefix::load() unless Prefix::loaded();
+
+	finish() if $dbm;
 	
-	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;
 	if ($mode) {
 		$dbm = tie (%u, 'DB_File', $ufn, O_CREAT|O_RDWR, 0666, $DB_BTREE) or confess "can't open qsl file: $qslfn ($!)";
 	} else {
@@ -47,7 +47,10 @@ sub init
 
 sub finish
 {
+	dbg("DXQSL finished");
+	$dbm->sync;
 	undef $dbm;
+	untie %u;
 }
 
 sub new
@@ -56,6 +59,8 @@ sub new
 	return bless [uc $call, []], $pkg;
 }
 
+# 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
 {
@@ -65,19 +70,24 @@ sub update
 	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;
 		
-		if (is_callsign($man)) {
+		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 {
+			next;
 		}
 		if ($tok) {
 			my ($r) = grep {$_->[0] eq $tok} @{$self->[1]};
@@ -93,6 +103,8 @@ sub update
 				unshift @{$self->[1]}, $r;
 				$changed++;
 			}
+			# prune the number of entries
+			pop @{$self->[1]} while (@{$self->[1]} > $maxentries);
 		}
 	}
 	$self->put if $changed;
@@ -106,16 +118,43 @@ sub get
 	
 	my $r = $dbm->get($key, $value);
 	return undef if $r;
-	return thaw($value);
+	return decode($value);
 }
 
+
 sub put
 {
 	return unless $dbm;
 	my $self = shift;
 	my $key = $self->[0];
-	my $value = nfreeze($self);
+	my $value = encode($self);
 	$dbm->put($key, $value);
 }
 
+sub remove_files
+{
+	unlink "$main::data/$qslfn.v1j";
+	unlink "$main::local_data/$qslfn.v1j";
+}
+
+# thaw the user
+sub decode
+{
+	return $json->decode($_[0], __PACKAGE__);
+}
+
+# freeze the user
+sub encode
+{
+	return $json->encode($_[0]);
+}
+
+sub END
+{
+	if ($dbm) {
+		dbg "DXQSL ENDing";
+		finish();
+	}
+}
+
 1;