X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLogPrint.pm;h=8a12b05c2791aa3f137fc13ce4f821f1dde5e528;hb=69c8aeb338cc485103e289fbab7ec4e7e056ed20;hp=fff39d1256894e6a1765249f0ac157d85fa65b0a;hpb=099c6b4a10d9f1e7471b0c94273cd992b5814cdc;p=spider.git

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index fff39d12..8a12b05c 100644
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -30,13 +30,17 @@ sub print
 	my $to = shift;
 	my @date = $self->unixtoj(shift);
 	my $pattern = shift;
+	my $who = uc shift;
 	my $search;
 	my @in;
 	my @out;
 	my $eval;
 	my $count;
 	    
-	$search = $pattern ? "\$ref->[1] =~ /$pattern/" : '1' ;
+	$search = '1' unless $pattern || $who;
+	$search = "\$ref->[1] =~ /$pattern/" if $pattern;
+	$search .= ' && ' if $pattern && $who;
+	$search .= "(\$ref->[2] =~ /$who/ || \$ref->[3] =~ /$who/)" if $who;
 	$eval = qq(
 			   my \$c;
 			   my \$ref;
@@ -98,7 +102,7 @@ sub print_item
 	} elsif ($ref[1] eq 'talk') {
 		$s = "$ref[3] -> $ref[2] ($ref[4]) $ref[5]";
 	} elsif ($ref[1] eq 'ann') {
-		$s = "$ref[2] -> $ref[3] $ref[4]";
+		$s = "$ref[3] -> $ref[2] $ref[4]";
 	} else {
 		$s = "$ref[2]";
 	}