remove warnings from $BRANCH lines for 5.8.0

[spider.git] / perl / DXDb.pm

diff --git a/perl/DXDb.pm b/perl/DXDb.pm
index 0f30e5b05b423d31d698c0700b4c21353525e39f..03e84e0cf9ad7c1c43c056fa5dfb393751146002 100644 (file)
--- 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
 {
@@ -76,9 +82,10 @@ sub load
 {
        my $s = readfilestr($dbbase, "dbs", "pl");
        if ($s) {
-               my $a = { eval $s } ;
+               my $a;
+               eval "\$a = $s";
                confess $@ if $@;
-               %avail = %{$a} if $a
+               %avail = ( %$a ) if ref $a;
        }
 }
 
@@ -255,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;
                }