X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=cbedad4114a561e5e16034ddfb587e7e8a826e36;hb=8f58735f5c9c090f2e5e00e05c7ad0834eccb741;hp=ff45336f30b6732d765004e1de513c3f6b8ff76f;hpb=b374b13c8eb9a57294e4ef0e2f45163341953f85;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index ff45336f..cbedad41 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,10 @@ $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',
 		 );
 
 no strict;
@@ -77,6 +86,9 @@ sub AUTOLOAD
 	$name =~ s/.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+	# this clever line of code creates a subroutine which takes over from autoload
+	# from OO Perl - Conway
+	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
 	if (@_) {
 		$self->{$name} = shift;
 	}
@@ -209,9 +221,10 @@ sub put
 	confess "Trying to put nothing!" unless $self && ref $self;
 	my $call = $self->{call};
 	# delete all instances of this 
-	for ($dbm->get_dup($call)) {
-		$dbm->del_dup($call, $_);
-	}
+#	for ($dbm->get_dup($call)) {
+#		$dbm->del_dup($call, $_);
+#	}
+	$dbm->del($call);
 	delete $self->{annok} if $self->{annok};
 	delete $self->{dxok} if $self->{dxok};
 	$dbm->put($call, $self->encode);
@@ -239,8 +252,8 @@ sub decode
 	my $ref;
 	eval '$ref = ' . $s;
 	if ($@) {
-		dbg('err', $@) if $@;
-		Log('err', $@) if $@;
+		dbg($@);
+		Log('err', $@);
 		$ref = undef;
 	}
 	return $ref;
@@ -255,9 +268,10 @@ sub del
 	my $self = shift;
 	my $call = $self->{call};
 	# delete all instances of this 
-	for ($dbm->get_dup($call)) {
-		$dbm->del_dup($call, $_);
-	}
+#	for ($dbm->get_dup($call)) {
+#		$dbm->del_dup($call, $_);
+#	}
+	$dbm->del($call);
 }
 
 #
@@ -335,7 +349,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>;
@@ -506,6 +520,11 @@ sub wantgrid
 	return _want('grid', @_);
 }
 
+sub wantann_talk
+{
+	return _want('ann_talk', @_);
+}
+
 sub wantlogininfo
 {
 	my $self = shift;