X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fstation.pl;h=26f2bbe6489fbb7f3c0b0274ddf74a65a15d4ca7;hb=9ffa482b325ca5b660a50e4bb845420cad17e969;hp=40c7eddbe3d6f59c7805ad9cba07b9a5f7f266eb;hpb=f3adc82a0299652d929b73c718127fa38571eec5;p=spider.git

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index 40c7eddb..26f2bbe6 100644
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -11,10 +11,19 @@ my @f = split /\s+/, uc $line;
 my @out;
 my $call;
 my $seek;
+push @f, $self->call unless @f;
 
-if (@f == 0) {
-	return (1, $self->msg('e6')) if ($self->priv < 5); 
-	my @calls = DXUser::get_all_calls();
+if (@f <= 2 && uc $f[0] eq 'ALL') {
+	return (1, $self->msg('e6')) if ($self->priv < 6); 
+	shift @f;
+	my $exp = shellregex(uc shift @f) if @f; 
+	my @calls;
+	if ($exp) {
+		@calls = grep {m{$exp}} DXUser::get_all_calls();
+    } else {
+		@calls = DXUser::get_all_calls();
+	}
+	
 	foreach $call (@calls) {
 		my $ref = DXUser->get_current($call);
 		next if !$ref;
@@ -59,8 +68,8 @@ if (@f == 0) {
 				$miles = $dx * 0.62133785;
 			}
 			
-			my $cref = DXCluster->get($call);
-			my $seek = $cref->mynode->call if $cref;
+			my $cref = Route::get($call);
+			my $seek = join(',', $cref->parents) if $cref;
 
 			if ($seek) {
 				push @out, "User         : $call (at $seek)";