Prepare for git repository

[spider.git] / perl / DXLogPrint.pm

diff --git a/perl/DXLogPrint.pm b/perl/DXLogPrint.pm
index 153f8f06e4941772729cba258bb968b979cede1a..326d564e9d2207c524aa2a02522801c185edda91 100644 (file)
--- a/perl/DXLogPrint.pm
+++ b/perl/DXLogPrint.pm
@@ -10,13 +10,17 @@ package DXLog;
 
 use IO::File;
 use DXVars;
-#use DXDebug ();
+use DXDebug qw(dbg isdbg);
 use DXUtil;
 use DXLog;
 use Julian;
+use RingBuf;
 
 use strict;
 
+use vars qw($maxmonths);
+$maxmonths = 36;
+
 #
 # print some items from the log backwards in time
 #
@@ -26,8 +30,7 @@ sub print
 {
        my $fcb = $DXLog::log;
        my $from = shift || 0;
-       my $to = shift || 20;
-       my $count;
+       my $to = shift || 10;
        my $jdate = $fcb->unixtoj(shift);
        my $pattern = shift;
        my $who = uc shift;
@@ -40,50 +43,60 @@ sub print
            
        if ($pattern) {
                $hint = "m{\\Q$pattern\\E}i";
+       } else {
+               $hint = "!m{\\^(?:ann|rcmd|talk|chat)\\^}";
        }
        if ($who) {
-               if ($hint) {
-                       $hint .= ' && ';
-               }
+               $hint .= ' && ' if $hint;
                $hint .= 'm{\\Q$who\\E}i';
-       }
+       } 
        $hint = "next unless $hint" if $hint;
+       $hint .= ";next unless /^\\d+\\^$pattern\\^/" if $pattern;
+       $hint ||= "";
        
-       $eval = qq(
-                          \@in = ();
-                          while (<\$fh>) {
+       $eval = qq(while (<\$fh>) {
                                   $hint;
                                   chomp;
-                                  push \@in, \$_;
-                                  shift \@in, if \@in > $tot;
-                          }
-                  );
+                                  \$ring->write(\$_);
+                          } );
+       
+       if (isdbg('search')) {
+               dbg("sh/log hint: $hint");
+               dbg("sh/log eval: $eval");
+       }
        
        $fcb->close;                                      # close any open files
 
+       my $months;
        my $fh = $fcb->open($jdate); 
-       L1: for ($count = 0; $count < $to; ) {
+ L1: for ($months = 0; $months < $maxmonths && @in < $tot; $months++) {
                my $ref;
+               my $ring = RingBuf->new($tot);
+
                if ($fh) {
+                       my @tmp;
                        eval $eval;               # do the search on this file
                        return ("Log search error", $@) if $@;
-                       my @tmp;
-                       while (@in) {
-                               last L1 if $count >= $to;
-                               my $ref = [ split /\^/, shift @in ];
-                               next if defined $pattern && $ref->[1] ne $pattern;
-                               push @tmp, print_item($ref);
-                               $count++;
-                       }
-                       @out = (@tmp, @out);
+                       
+                       @in = ($ring->readall, @in);
+                       last L1 if @in >= $tot;
                }
+
                $fh = $fcb->openprev();      # get the next file
                last if !$fh;
        }
        
+       @in = splice @in, -$tot, $tot if @in > $tot;
+    
+       for (@in) {
+               my @line = split /\^/ ;
+               push @out, print_item(\@line);
+       
+       }
        return @out;
 }
 
+
 #
 # the standard log printing interpreting routine.
 #
@@ -97,22 +110,27 @@ sub print
 sub print_item
 {
        my $r = shift;
-       my @ref = @$r;
-       my $d = atime($ref[0]);
+       my $d = atime($r->[0]);
        my $s = 'undef';
        
-       if ($ref[1] eq 'rcmd') {
-               if ($ref[2] eq 'in') {
-                       $s = "$ref[4] (priv: $ref[3]) rcmd: $ref[5]";
+       if ($r->[1] eq 'rcmd') {
+               if ($r->[2] eq 'in') {
+                       $r->[5] ||= "";
+                       $s = "$r->[4] (priv: $r->[3]) rcmd: $r->[5]";
                } else {
-                       $s = "$ref[3] reply: $ref[4]";
+                       $r->[4] ||= "";
+                       $s = "$r->[3] reply: $r->[4]";
                }
-       } elsif ($ref[1] eq 'talk') {
-               $s = "$ref[3] -> $ref[2] ($ref[4]) $ref[5]";
-       } elsif ($ref[1] eq 'ann') {
-               $s = "$ref[3] -> $ref[2] $ref[4]";
+       } elsif ($r->[1] eq 'talk') {
+               $r->[5] ||= "";
+               $s = "$r->[3] -> $r->[2] ($r->[4]) $r->[5]";
+       } elsif ($r->[1] eq 'ann' || $r->[1] eq 'chat') {
+               $r->[4] ||= "";
+               $r->[4] =~ s/^\#\d+ //;
+               $s = "$r->[3] -> $r->[2] $r->[4]";
        } else {
-               $s = "$ref[2]";
+               $r->[2] ||= "";
+               $s = "$r->[2]";
        }
        return "$d $s";
 }