add an RBN line to progress

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 3ad8d5c2849bb6fda63b7e4653b67ec0ff6607a0..91f3a3f02caab2900ac3deb4f21d2ea81ffa088e 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -149,6 +149,12 @@ 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 RBN FT4/8,yesno',
+                 wantcw => '0,Want RBN CW,yesno',
+                 wantrtty => '0,Want RBN RTTY,yesno',
+                 wantpsk => '0,Want RBN PSK,yesno',
+                 wantbeacon => '0,Want (RBN) Beacon,yesno',
                  lastoper => '9,Last for/oper,cldatetime',
                  nothere => '0,Not Here Text',
                  registered => '9,Registered?,yesno',
@@ -196,13 +202,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 +842,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 +949,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 +978,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;