X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=fb88ad824f606f317036ada284d83617f19d3775;hb=bfd4e140dcf03f12bbda1dd405f8b135f86d0b6a;hp=3ad8d5c2849bb6fda63b7e4653b67ec0ff6607a0;hpb=fda536aef281e0f6fc68a02c537d18650bd5505f;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index 3ad8d5c2..fb88ad82 100644 --- a/perl/DXUser.pm +++ b/perl/DXUser.pm @@ -196,13 +196,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; } @@ -937,7 +937,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 +966,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;