#
# Local 'autoqsl' module for DXSpider
#
-# Copyright (c) 2003 Dirk Koopman G1TLH
+# Copyright (c) 2003-2020 Dirk Koopman G1TLH
#
package QSL;
use DXDebug;
use Prefix;
+use JSON;
+use Data::Structure::Util qw(unbless);
+
use vars qw($qslfn $dbm $maxentries);
-$qslfn = 'qsl';
+$qslfn = 'dxqsl';
$dbm = undef;
-$maxentries = 50;
+$maxentries = 10;
-localdata_mv("$qslfn.v1");
+my $json;
+my %u;
sub init
{
my $mode = shift;
- my $ufn = localdata("$qslfn.v1");
+ my $ufn = localdata("$qslfn.v2");
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;
+ $json = JSON->new->canonical(1);
+
+ untie %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 ($!)";
sub finish
{
+ untie %u;
undef $dbm;
}
sub new
{
my ($pkg, $call) = @_;
+ return undef if $call =~ /INFO|QSL|VIA/;
return bless [uc $call, []], $pkg;
}
my $by = shift;
my $changed;
- return unless length $line && $line =~ /\b(?:QSL|VIA)\b/i;
+ return unless length $line && $line =~ /\b(?:QSL|VIA|BUR[OE]?A?U?|OQRS|LOTW)\b/i;
foreach my $man (split /\b/, uc $line) {
my $tok;
$tok = 'BUREAU';
} elsif ($man =~ /^LOTW/) {
$tok = 'LOTW';
+ } elsif ($man =~ /^OQRS/) {
+ $tok = 'OQRS';
} elsif ($man eq 'HC' || $man =~ /^HOM/ || $man =~ /^DIR/) {
$tok = 'HOME CALL';
} elsif ($man =~ /^QRZ/) {
{
return undef unless $dbm;
my $key = uc shift;
+
my $value;
-
my $r = $dbm->get($key, $value);
return undef if $r;
- return thaw($value);
+ return json_decode($value);
}
sub put
return unless $dbm;
my $self = shift;
my $key = $self->[0];
- my $value = nfreeze($self);
+ my $value = json_encode($self);
$dbm->put($key, $value);
}
+sub json_decode
+{
+ my $s = shift;
+ my $ref;
+ eval { $ref = $json->decode($s) };
+ if ($ref && !$@) {
+ return bless $ref, __PACKAGE__;
+ } else {
+ LogDbg('DXUser', "__PACKAGE_::json_decode: on '$s' $@");
+ }
+ return undef;
+}
+
+sub json_encode
+{
+ my $ref = shift;
+ unbless($ref);
+ my $s = $json->encode($ref);
+ bless $ref, __PACKAGE__;
+ return $s;
+}
+
1;