X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=160877aef11b5658ba9c3ad1e0988d3b016357a0;hb=bbcb636f1bc71eb1426685ef64382ea42d27ecfb;hp=fa9e109f56cbe5a1cb3ca8cf7b66307290f1a535;hpb=4e5b3de7a26563d94678fb790b8a1e2c4daaac8d;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index fa9e109f..160877ae 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -16,6 +16,13 @@ use IO::File;
 use DXDebug;
 
 use strict;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime);
 
 %u = ();
@@ -63,8 +70,11 @@ $lasttime = 0;
 		  pingint => '9,Node Ping interval',
 		  nopings => '9,Ping Obs Count',
 		  wantlogininfo => '9,Login info req,yesno',
-	          wantgrid => '0,DX Grid Info,yesno',
+          wantgrid => '0,DX Grid Info,yesno',
+		  wantann_talk => '0,Talklike Anns,yesno',
 		  lastoper => '9,Last for/oper,cldatetime',
+		  nothere => '0,Not Here Text',
+		  registered => '9,Registered?,yesno',
 		 );
 
 no strict;
@@ -243,8 +253,8 @@ sub decode
 	my $ref;
 	eval '$ref = ' . $s;
 	if ($@) {
-		dbg('err', $@) if $@;
-		Log('err', $@) if $@;
+		dbg($@);
+		Log('err', $@);
 		$ref = undef;
 	}
 	return $ref;
@@ -340,7 +350,7 @@ BEGIN {
 	
 	# try to detect a lockfile (this isn't atomic but 
 	# should do for now
-	$lockfn = "$root/perl/cluster.lock";       # lock file name
+	$lockfn = "$root/perl/cluster.lck";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -511,12 +521,17 @@ sub wantgrid
 	return _want('grid', @_);
 }
 
+sub wantann_talk
+{
+	return _want('ann_talk', @_);
+}
+
 sub wantlogininfo
 {
 	my $self = shift;
-	my $n = shift;
-	$self->{wantlogininfo} = $n if $n;
-	return exists $self->{wantlogininfo} ? $self->{wantlogininfo} : 0;
+	my $val = shift;
+	$self->{wantlogininfo} = $val if defined $val;
+	return $self->{wantlogininfo};
 }
 
 sub is_node