From: minima <minima>
Date: Tue, 15 Oct 2002 00:42:11 +0000 (+0000)
Subject: detail messaging
X-Git-Tag: PRE-1-52~143
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cb5f21f8f960a003b80e7415f945d718f4b7d43e;p=spider.git

detail messaging
---

diff --git a/cmd/load/usdb.pl b/cmd/load/usdb.pl
index b06f7c51..d2b10e30 100644
--- a/cmd/load/usdb.pl
+++ b/cmd/load/usdb.pl
@@ -15,6 +15,4 @@
 my ($self, $line) = @_;
 my @out;
 return (1, $self->msg('e5')) if $self->priv < 9;
-my $r = USDB::load($line) if $line;
-USDB::init() if undef $r || $r =~ /^\d+ rec/;
-return (1, @out); 
+return (1, USDB::init()); 
diff --git a/perl/USDB.pm b/perl/USDB.pm
index 69e1ead0..719ac66a 100644
--- a/perl/USDB.pm
+++ b/perl/USDB.pm
@@ -30,10 +30,9 @@ sub init
 	end();
 	if (tie %db, 'DB_File', $dbfn, O_RDONLY, 0664, $DB_BTREE) {
 		$present = 1;
-		dbg("US Database loaded");
-	} else {
-		dbg("US Database not loaded");
+		return "US Database loaded";
 	}
+	return "US Database not loaded";
 }
 
 sub end
diff --git a/perl/cluster.pl b/perl/cluster.pl
index c4a61fd2..b89e5805 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -396,7 +396,7 @@ dbg("DXSpider Version $version, build $build started");
 # load Prefixes
 dbg("loading prefixes ...");
 Prefix::load();
-USDB::init();
+dbg(USDB::init());
 
 # load band data
 dbg("loading band data ...");