detail messaging

diff --git a/cmd/load/usdb.pl b/cmd/load/usdb.pl
index b06f7c51b64eea0332ecb43054dddc7de4dcbfad..d2b10e308626f79e753fae7b7385c52f38eda70b 100644 (file)
--- 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 69e1ead083446e4fbf3fa5c43900299c1418aee9..719ac66afe30db127d95008c32305d09ef8532dd 100644 (file)
--- 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 c4a61fd29cdcd9948072658f96687ffda812f61e..b89e5805696fc82787193234f4266897beed30af 100755 (executable)
--- 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 ...");