package DXLog;
-use FileHandle;
+use IO::File;
use DXVars;
use DXDebug ();
use DXUtil;
#
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;
\$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;
}