try this way

[spider.git] / perl / DXLogPrint.pm

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index b287413da9a511d7e5cb8e3863889c0228bde6d9..6d37cb415d16ddfba84d481aa69055e881f653d2 100644 (file)
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -10,11 +10,10 @@ package DXLog;
 
 use IO::File;
 use DXVars;
-use DXDebug ();
+#use DXDebug ();
 use DXUtil;
 use DXLog;
 use Julian;
-use Carp;
 
 use strict;
 
@@ -36,14 +35,33 @@ sub print
        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) {
@@ -61,13 +79,6 @@ sub print
        for ($count = 0; $count < $to; ) {
                my $ref;
                if ($fh) {
-                       @in = ();
-                       while (<$fh>) {
-                               chomp;
-                               $ref = [ split '\^' ];
-                               push @{$ref}, "" unless @{$ref} >= 4;
-                               push @in, $ref;
-                       }
                        eval $eval;               # do the search on this file
                        last if $count >= $to;                  # stop after n
                        return ("Log search error", $@) if $@;