X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fdbshow.pl;h=36879ff551cd54409278622f4aea90eb83d76c1e;hb=refs%2Fheads%2Fnewprot;hp=1c3b0139e2529017bc4909b104633914e4aebbdb;hpb=88c2b296ba903fdd356e351b83fcb844e2d6eacd;p=spider.git

diff --git a/cmd/dbshow.pl b/cmd/dbshow.pl
index 1c3b0139..36879ff5 100644
--- a/cmd/dbshow.pl
+++ b/cmd/dbshow.pl
@@ -24,15 +24,16 @@ 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));
+			DXChannel::route(undef, $db->remote, DXProt::pc44($main::mycall, $db->remote, $n, uc $db->name,uc $_, $self->call));
 		}
 		last;
 	} else {
@@ -40,11 +41,11 @@ foreach  $n (@db) {
 		# local databases can chain to remote ones
 		my $count;
 		push @out, $db->print('pre');
-		push @out, "@f";
+#		push @out, "@f";
 		for (@f) {
-			push @out, $db->name . " $_";
-			my $value = $db->getkey($_);
-			push @out, $db->name . ": $_ : $value";
+#			push @out, $db->name . " $_";
+			my $value = $db->getkey($_) || "";
+			push @out, $db->name . ": $_ :";
 			if ($value) {
 				push @out, split /\n/, $value;
 				$count++;