X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FQSL.pm;fp=perl%2FQSL.pm;h=e303e123aaa1bedf87393cab649eb4b9a858b6fe;hb=dd73f6f34ce7f3e142e480dfb7153611d87f509b;hp=0df7570ba24f615ac1fccce38cde2d59955588ca;hpb=798676823da80374c511e61fc5c3b91220da7f10;p=spider.git

diff --git a/perl/QSL.pm b/perl/QSL.pm
index 0df7570b..e303e123 100644
--- a/perl/QSL.pm
+++ b/perl/QSL.pm
@@ -8,37 +8,33 @@
 package QSL;
 
 use strict;
-use DXVars;
+use SysVar;
 use DXUtil;
 use DB_File;
 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;
 
-localdata_mv("$qslfn.v1");
+my $json;
+
+localdata_mv("$qslfn.v1j");
 
 sub init
 {
 	my $mode = shift;
-	my $ufn = localdata("$qslfn.v1");
+	my $ufn = localdata("$qslfn.v1j");
 
-	Prefix::load() unless Prefix::loaded();
+	$json = JSON->new->canonical(1);
 	
-	eval {
-		require Storable;
-	};
+	Prefix::load() unless Prefix::loaded();
 	
-	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) {
@@ -119,7 +115,7 @@ sub get
 	
 	my $r = $dbm->get($key, $value);
 	return undef if $r;
-	return thaw($value);
+	return decode($value);
 }
 
 sub put
@@ -127,8 +123,40 @@ 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/qsl.v1j";
+	unlink "$main::local_data/qsl.v1j";
+}
+
+# thaw the user
+sub decode
+{
+    my $s = shift;
+    my $ref;
+    eval { $ref = $json->decode($s) };
+    if ($ref && !$@) {
+        return bless $ref, 'QSL';
+    } 
+    return undef;
+}
+
+# freeze the user
+sub encode
+{
+    my $ref = shift;
+    unbless($ref);
+    my $s;
+	
+	eval {$s = $json->encode($ref) };
+	if ($s && !$@) {
+		bless $ref, 'QSL';
+		return $s;
+	} 
+}
+
 1;