X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLogPrint.pm;h=a6d074a6a64bfd78c768dae4e7388126f537117f;hb=8e14149148baba63ce5ae2b95aacda8ab6dd0d87;hp=244402d6962493e685edb147cd734e83427284f3;hpb=ef77e5488c4cc47afe272f6220cc3fa0cddc5829;p=spider.git

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index 244402d6..a6d074a6 100644
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -18,7 +18,7 @@ use DXLog;
 use Julian;
 
 
-our $readback = 1;
+our $readback = $main::is_win ? 0 : 1;
 if ($readback) {
 	$readback = `which tac`;
 } 
@@ -36,11 +36,11 @@ $maxmonths = 36;
 #
 # This command outputs a list of n lines starting from time t with $pattern tags
 #
-sub print
+sub search
 {
 	my $fcb = $DXLog::log;
-	my $from = shift || 0;
-	my $to = shift || 10;
+	my $from = shift // 0;
+	my $to = shift // 10;
 	my $jdate = $fcb->unixtoj(shift);
 	my $pattern = shift;
 	my $who = shift;
@@ -53,8 +53,10 @@ sub print
 	    
 	$who = uc $who if defined $who;
 
+	dbg("from: $from to: $to pattern: $pattern hint: $hint") if isdbg('search');
+	
 	if ($pattern) {
-		$hint = q{m{\Q$pattern\E}i};
+		$hint = qq{m{\Q$pattern\E}i};
 	} else {
 		$hint = q{!m{\^(?:ann|rcmd|talk|chat)\^}};
 	}
@@ -63,7 +65,7 @@ sub print
 		$hint .= q{m{\Q$who\E}i};
 	} 
 	$hint = "next unless $hint" if $hint;
-	$hint .= "; next unless m{^\\d+\\^$pattern\\^}" if $pattern;
+	$hint .= "; next unless m{^\\d+\\^$pattern\\^}i" if $pattern;
 	$hint ||= "";
 	
 	$eval = qq(while (<\$fh>) {
@@ -112,10 +114,20 @@ sub print
 		return "show/$name: ${s}not found";
 	} 
 
-	for (sort {$a <=> $b } @in) {
-		my @line = split /\^/ ;
-		push @out, print_item(\@line);
-	
+	for (sort {$a cmp $b } @in) {
+		push @out, [ split /\^/ ]
+	}
+
+	return @out;
+}
+
+sub print
+{
+	my @out;
+
+	my @in = search(@_);
+	for (@in) {
+		push @out, print_item($_);
 	}
 	return @out;
 }