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

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index fff39d12..60f8b685 100644
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -8,13 +8,12 @@
 
 package DXLog;
 
-use FileHandle;
+use IO::File;
 use DXVars;
-use DXDebug ();
+#use DXDebug ();
 use DXUtil;
 use DXLog;
 use Julian;
-use Carp;
 
 use strict;
 
@@ -25,18 +24,22 @@ use strict;
 #
 sub print
 {
-	my $self = $DXLog::log;
+	my $fcb = $DXLog::log;
 	my $from = shift;
 	my $to = shift;
-	my @date = $self->unixtoj(shift);
+	my @date = Julian::unixtojm(shift);
 	my $pattern = shift;
+	my $who = uc shift;
 	my $search;
 	my @in;
-	my @out;
+	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;
@@ -46,29 +49,32 @@ sub print
 						\$count++;
 						next if \$count < $from;
 						push \@out, print_item(\$ref);
-						last LOOP if \$count >= \$to;                  # stop after n
+						last if \$count >= \$to;                  # stop after n
 					}
 				}
 			  );
 	
-	$self->close;                                      # close any open files
+	$fcb->close;                                      # close any open files
 
-	my $fh = $self->open(@date); 
-LOOP:
-	while ($count < $to) {
-		my @spots = ();
+	my $fh = $fcb->open(@date); 
+	for ($count = 0; $count < $to; ) {
+		my $ref;
 		if ($fh) {
+			@in = ();
 			while (<$fh>) {
 				chomp;
-				push @in, [ split '\^' ];
+				$ref = [ split '\^' ];
+				push @{$ref}, "" unless @{$ref} >= 4;
+				push @in, $ref;
 			}
 			eval $eval;               # do the search on this file
-			return ("Spot search error", $@) if $@;
+			last if $count >= $to;                  # stop after n
+			return ("Log search error", $@) if $@;
 		}
-		$fh = $self->openprev();      # get the next file
+		$fh = $fcb->openprev();      # get the next file
 		last if !$fh;
 	}
-
+	
 	return @out;
 }
 
@@ -98,7 +104,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]";
 	}