X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fannounce.pl;h=267d27c330a4fe47181a8a8086c8a172dee4e5b2;hb=e2ca7811e49048bfad82ec31e148a79fe9904e2b;hp=3454140ecf3abe96d3b7f112794982d70aca0322;hpb=0ce79a125db0acb043fceaa641d8b3a9eae71a41;p=spider.git

diff --git a/cmd/show/announce.pl b/cmd/show/announce.pl
index 3454140e..267d27c3 100644
--- a/cmd/show/announce.pl
+++ b/cmd/show/announce.pl
@@ -28,13 +28,19 @@ while ($f = shift @f) {                 # next field
 		next if $to;
 	}
 	next if $who;
-	($who) = $f =~ /^(\w+)/o;
+	if ($f !~ /^\d+/) {
+		($who) = $f;
+	}
+	if ($f !~ /^\d+/) {
+		($who) = $f;
+	}
+	#($who) = $f =~ /^(\w+)/o;
 }
 
 $to = 20 unless $to;
 $from = 0 unless $from;
 
-@out = $self->spawn_cmd(\&DXLog::print, args => [$from, $to, $main::systime, 'ann', $who]);
+return (1, DXLog::print($from, $to, $main::systime, 'ann', $who)) if $self->{_nospawn};;
+return (1, $self->spawn_cmd("show/announce $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, 'ann', $who]));
 	
-#@out = DXLog::print($from, $to, $main::systime, 'ann', $who);
 return (1, @out);