fix sh/log things to allow all search strings

[spider.git] / cmd / show / announce.pl

diff --git a/cmd/show/announce.pl b/cmd/show/announce.pl
index 3454140ecf3abe96d3b7f112794982d70aca0322..267d27c330a4fe47181a8a8086c8a172dee4e5b2 100644 (file)
--- 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);