X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdbshow.pl;h=e6e138c2b414ab75f05e3443a9976091b26f30ff;hb=refs%2Fheads%2Fstaging;hp=1c3b0139e2529017bc4909b104633914e4aebbdb;hpb=88c2b296ba903fdd356e351b83fcb844e2d6eacd;p=spider.git

diff --git a/cmd/dbshow.pl b/cmd/dbshow.pl
index 1c3b0139..e6e138c2 100644
--- a/cmd/dbshow.pl
+++ b/cmd/dbshow.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Database update routine
+# Database enquiry routine
 #
 # Copyright (c) 1999 Dirk Koopman G1TLH
 #
@@ -24,27 +24,29 @@ foreach  $n (@db) {
 	if ($db->remote) {
 
 		# remote databases
-		unless (DXCluster->get_exact($db->remote) || DXChannel->get($db->remote)) {
+		unless (Route::Node::get($db->remote) || DXChannel::get($db->remote)) {
 			push @out, $self->msg('db4', uc $name, $db->remote);
 			last;
 		}
 		
 		push @out, $self->msg('db11', $db->remote);
+		push @f, " " unless @f;
 		for (@f) {
 			my $n = DXDb::newstream($self->call);
 			DXProt::route(undef, $db->remote, DXProt::pc44($main::mycall, $db->remote, $n, uc $db->name,uc $_, $self->call));
 		}
-		last;
+#		last;
 	} else {
 
 		# local databases can chain to remote ones
 		my $count;
-		push @out, $db->print('pre');
-		push @out, "@f";
+		my $pre = $db->print('pre');
+		push @out, $pre if defined $pre;
+#		push @out, "@f";
 		for (@f) {
 			push @out, $db->name . " $_";
-			my $value = $db->getkey($_);
-			push @out, $db->name . ": $_ : $value";
+			my $value = $db->getkey($_) || "";
+#			push @out, $db->name . ": $_ :";
 			if ($value) {
 				push @out, split /\n/, $value;
 				$count++;
@@ -53,8 +55,9 @@ foreach  $n (@db) {
 			}
 		}
 		if ($count) {
-			push @out, $db->print('post');
-			last;
+			my $post = $db->print('post');
+			push @out, $post if $post;
+#			last;
 		}
 	}
 }