package DXLog;
-use FileHandle;
+use IO::File;
use DXVars;
-use DXDebug ();
+#use DXDebug ();
use DXUtil;
use DXLog;
use Julian;
-use Carp;
use strict;
#
sub print
{
- my $self = $DXLog::log;
+ my $fcb = $DXLog::log;
my $from = shift;
my $to = shift;
- my @date = $self->unixtoj(shift);
+ my $jdate = $fcb->unixtoj(shift);
my $pattern = shift;
my $who = uc shift;
my $search;
my @in;
- my @out;
+ my @out = ();
my $eval;
my $count;
+ my $hint = "";
- $search = '1' unless $pattern || $who;
- $search = "\$ref->[1] =~ /$pattern/" if $pattern;
- $search .= ' && ' if $pattern && $who;
- $search .= "(\$ref->[2] =~ /$who/ || \$ref->[3] =~ /$who/)" if $who;
+ if ($pattern) {
+ $search = "\$ref->[1] =~ m{^$pattern}i";
+ $hint = "m{$pattern}i";
+ }
+ if ($who) {
+ if ($search) {
+ $search .= ' && ';
+ $hint .= ' && ';
+ }
+ $search .= "(\$ref->[2] =~ m{$who}i || \$ref->[3] =~ m{$who}i)";
+ $hint .= 'm{$who}i';
+ }
+ $hint = "next unless $hint" if $hint;
+ $search = "1" unless $search;
+
$eval = qq(
+ \@in = ();
+ while (<\$fh>) {
+ $hint;
+ chomp;
+ \$ref = [ split '\\^' ];
+ push \@\$ref, "" unless \@\$ref >= 4;
+ push \@in, \$ref;
+ }
my \$c;
- my \$ref;
for (\$c = \$#in; \$c >= 0; \$c--) {
\$ref = \$in[\$c];
if ($search) {
\$count++;
next if \$count < $from;
- push \@out, print_item(\$ref);
+ unshift \@out, print_item(\$ref);
last if \$count >= \$to; # stop after n
}
}
);
- $self->close; # close any open files
+ $fcb->close; # close any open files
- my $fh = $self->open(@date);
+ my $fh = $fcb->open($jdate);
for ($count = 0; $count < $to; ) {
- my @spots = ();
+ my $ref;
if ($fh) {
- while (<$fh>) {
- chomp;
- push @in, [ split '\^' ];
- }
eval $eval; # do the search on this file
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 if defined @out;
+ return @out;
}
#