X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDb.pm;h=b7a886716df0181f76f4fe694179cde9340afee8;hb=1006337e105ab06a0e468bc483332fd385dd5240;hp=6ccb9105c3307426b5c430a60fa438c5bda0ec39;hpb=3ef8742c2e330e42f6f47a5d68a3a7c01b6a15eb;p=spider.git

diff --git a/perl/DXDb.pm b/perl/DXDb.pm
index 6ccb9105..b7a88671 100644
--- a/perl/DXDb.pm
+++ b/perl/DXDb.pm
@@ -48,6 +48,12 @@ $lastprocesstime = time;
 $nextstream = 0;
 %stream = ();
 
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 # allocate a new stream for this request
 sub newstream
 {
@@ -256,18 +262,18 @@ sub process
 			my $db = getdesc($f[4]);
 			if ($db) {
 				if ($db->{remote}) {
-					sendremote($dxchan, $f[2], $f[3], $dxchan->msg('dx1', $db->{remote}));
+					sendremote($dxchan, $f[2], $f[3], $dxchan->msg('db1', $db->{remote}));
 				} else {
 					my $value = $db->getkey($f[5]);
 					if ($value) {
 						my @out = split /\n/, $value;
 						sendremote($dxchan, $f[2], $f[3], @out);
 					} else {
-						sendremote($dxchan, $f[2], $f[3], $dxchan->msg('dx2', $f[5], $db->{name}));
+						sendremote($dxchan, $f[2], $f[3], $dxchan->msg('db2', $f[5], $db->{name}));
 					}
 				}
 			} else {
-				sendremote($dxchan, $f[2], $f[3], $dxchan->msg('dx3', $f[4]));
+				sendremote($dxchan, $f[2], $f[3], $dxchan->msg('db3', $f[4]));
 			}
 			last SWITCH;
 		}
@@ -339,19 +345,22 @@ sub field_prompt
 	return $valid{$ele};
 }
 
-no strict;
+#no strict;
 sub AUTOLOAD
 {
 	my $self = shift;
+	no strict;
 	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
+	$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}} ;
-	@_ ? $self->{$name} = shift : $self->{$name} ;
+	*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+	&$AUTOLOAD($self, @_);
+#	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+#	@_ ? $self->{$name} = shift : $self->{$name} ;
 }
 
 1;