X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fannounce.pl;h=30b1f8798706e2450251a7692d3ae3e822b4e2ae;hb=8e14149148baba63ce5ae2b95aacda8ab6dd0d87;hp=9ec0111b3cc491671ff4691a4fbf71d540fd5faa;hpb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;p=spider.git

diff --git a/cmd/show/announce.pl b/cmd/show/announce.pl
index 9ec0111b..30b1f879 100644
--- a/cmd/show/announce.pl
+++ b/cmd/show/announce.pl
@@ -28,11 +28,28 @@ 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 = DXLog::print($from, $to, $main::systime, 'ann', $who);
+# if we can get it out of the cache than do it
+if (!$who && !$from && $to < @AnnTalk::anncache) {
+	my @in = @AnnTalk::anncache[-$to .. -1];
+	for (@in) {
+		push @out, DXLog::print_item($_);
+	}
+	return (1, @out);
+}
+
+return (1, DXLog::print($from, $to, $main::systime, 'ann', $who)) if ($self->{_nospawn} || $main::is_win == 1) || $DB::VERSION;
+return (1, $self->spawn_cmd("show/announce $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, 'ann', $who]));
+	
 return (1, @out);