X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLogPrint.pm;h=c2434aba48f8f5eda22edc3c2c909e7371ffc095;hb=fbfd8dc2d58c550bf3922efb54ec4ee817df07d5;hp=58f18ffdd7604eae03239eb7fb48cbecbb793270;hpb=97fa4618141c1e20858660a6732d94ea3f431dd9;p=spider.git diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm index 58f18ffd..c2434aba 100644 --- a/perl/DXLogPrint.pm +++ b/perl/DXLogPrint.pm @@ -27,7 +27,7 @@ sub print my $fcb = $DXLog::log; my $from = shift; my $to = shift; - my @date = Julian::unixtojm(shift); + my $jdate = $fcb->unixtoj(shift); my $pattern = shift; my $who = uc shift; my $search; @@ -37,12 +37,10 @@ sub print my $count; my $hint = ""; - $search = '1' unless $pattern || $who; if ($pattern) { - $search = "\$ref->[1] =~ m{$pattern}i"; + $search = "\$ref->[1] =~ m{^$pattern}i"; $hint = "m{$pattern}i"; } - if ($who) { if ($search) { $search .= ' && '; @@ -52,6 +50,7 @@ sub print $hint .= 'm{$who}i'; } $hint = "next unless $hint" if $hint; + $search = "1" unless $search; $eval = qq( \@in = (); @@ -68,7 +67,7 @@ sub print if ($search) { \$count++; next if \$count < $from; - push \@out, print_item(\$ref); + unshift \@out, print_item(\$ref); last if \$count >= \$to; # stop after n } } @@ -76,7 +75,7 @@ sub print $fcb->close; # close any open files - my $fh = $fcb->open(@date); + my $fh = $fcb->open($jdate); for ($count = 0; $count < $to; ) { my $ref; if ($fh) {