X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=25093661117f682884894021681ab9b9ffa14a9a;hb=dbeecf2c5b0e87c38b52edf992d41b122a676fcd;hp=3ad8d5c2849bb6fda63b7e4653b67ec0ff6607a0;hpb=fda536aef281e0f6fc68a02c537d18650bd5505f;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 3ad8d5c2..25093661 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -149,6 +149,9 @@ my $ifh;						# the input file, initialised by readinjson()
 		  wantdxitu => '0,Show ITU Zone,yesno',
 		  wantgtk => '0,Want GTK interface,yesno',
 		  wantpc9x => '0,Want PC9X interface,yesno',
+		  wantrbn => '0,Want RBN spots,yesno',
+		  wantft => '0,Want FT4/8 spots,yesno',
+		  wantcw => '0,Want (RBN) CW spots,yesno',
 		  lastoper => '9,Last for/oper,cldatetime',
 		  nothere => '0,Not Here Text',
 		  registered => '9,Registered?,yesno',
@@ -196,13 +199,13 @@ sub init
 	if (-e $filename || -e "$filename.n" || -e "$filename.o") {
 		$v4 = 1;
 	} else {
-		if (-e localdata('users.v3')) {
-			LogDbg('DXUser', "Converting " . localdata('users.v3') . " to new json version of users file, please wait");
-			if (-x $convert) {
-				system($convert);
-				++$export;
-			}
-		}
+#		if (-e localdata('users.v3')) {
+#			LogDbg('DXUser', "Converting " . localdata('users.v3') . " to new json version of users file, please wait");
+#			if (-x $convert) {
+#				system($convert);
+#				++$export;
+#			}
+#		}
 		
 		die "User file $filename missing, please run $convert or copy a user_json backup from somewhere\n" unless -e "$filename.n" || -s $filename;
 	}
@@ -836,6 +839,12 @@ sub is_ak1a
 	return $self->{sort} eq 'A';
 }
 
+sub is_rbn
+{
+	my $self = shift;
+	return $self->{sort} eq 'N'
+}
+
 sub unset_passwd
 {
 	my $self = shift;
@@ -937,7 +946,7 @@ sub readinjson
 
 	# $ifh is "global" and should not be closed
 	
-	dbg("DXUser::readinjson $count record headers read from $fn in ". _diffms($ta) . " mS");
+	LogDbg('DXUser',"DXUser::readinjson $count record headers read from $fn in ". _diffms($ta) . " mS");
 	return $totusers = $count;
 }
 
@@ -966,7 +975,7 @@ sub writeoutjson
 	}
 	
 	$ofh->close;
-	dbg("DXUser::writeoutjson $count records written to $ofn in ". _diffms($ta) . " mS");
+	LogDbg('DXUser',"DXUser::writeoutjson $count records written to $ofn in ". _diffms($ta) . " mS");
 	return $count;
 }
 1;