projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added new html
[spider.git]
/
perl
/
DXLogPrint.pm
diff --git
a/perl/DXLogPrint.pm
b/perl/DXLogPrint.pm
index 54cfc516b2173a2ea850ff3b585d4976df25eaaf..9c5633e1fbf2d3bb085d8eeec62c4bf267ebd3b5 100644
(file)
--- 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 $to = shift;
my @date = $self->unixtoj(shift);
my $pattern = shift;
+ my $who = uc shift;
my $search;
my @in;
my @out;
my $eval;
my $count;
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;
$eval = qq(
my \$c;
my \$ref;
@@
-46,7
+50,7
@@
sub print
\$count++;
next if \$count < $from;
push \@out, print_item(\$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
}
}
);
}
}
);
@@
-54,8
+58,7
@@
sub print
$self->close; # close any open files
my $fh = $self->open(@date);
$self->close; # close any open files
my $fh = $self->open(@date);
-LOOP:
- while ($count < $to) {
+ for ($count = 0; $count < $to; ) {
my @spots = ();
if ($fh) {
while (<$fh>) {
my @spots = ();
if ($fh) {
while (<$fh>) {
@@
-63,13
+66,14
@@
LOOP:
push @in, [ split '\^' ];
}
eval $eval; # do the search on this file
push @in, [ split '\^' ];
}
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
last if !$fh;
}
}
$fh = $self->openprev(); # get the next file
last if !$fh;
}
-
- return @out;
+
+ return @out
if defined @out
;
}
#
}
#