projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
limit the no of spots stored for a search
[spider.git]
/
perl
/
DXLogPrint.pm
diff --git
a/perl/DXLogPrint.pm
b/perl/DXLogPrint.pm
index a01f5dedca68f663d55f07dc69465aff42746c77..9bb51f20a579a2e34ecf6220e5690ba7cd9e420a 100644
(file)
--- a/
perl/DXLogPrint.pm
+++ b/
perl/DXLogPrint.pm
@@
-3,25
+3,30
@@
#
# Copyright (c) - 1998 Dirk Koopman G1TLH
#
#
# Copyright (c) - 1998 Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package DXLog;
#
package DXLog;
+use 5.10.1;
+
use IO::File;
use DXVars;
use IO::File;
use DXVars;
-
#use DXDebug (
);
+
use DXDebug qw(dbg isdbg
);
use DXUtil;
use DXLog;
use Julian;
use DXUtil;
use DXLog;
use Julian;
+
+our $readback = `which tac`;
+chomp $readback;
+undef $readback; # yet another reason not to use the cloud!
+
+
use strict;
use strict;
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+use vars qw($maxmonths);
+$maxmonths = 36;
#
# print some items from the log backwards in time
#
# print some items from the log backwards in time
@@
-32,10
+37,10
@@
sub print
{
my $fcb = $DXLog::log;
my $from = shift || 0;
{
my $fcb = $DXLog::log;
my $from = shift || 0;
- my $to = shift ||
2
0;
+ my $to = shift ||
1
0;
my $jdate = $fcb->unixtoj(shift);
my $pattern = shift;
my $jdate = $fcb->unixtoj(shift);
my $pattern = shift;
- my $who =
uc
shift;
+ my $who = shift;
my $search;
my @in;
my @out = ();
my $search;
my @in;
my @out = ();
@@
-43,44
+48,68
@@
sub print
my $tot = $from + $to;
my $hint = "";
my $tot = $from + $to;
my $hint = "";
+ $who = uc $who if defined $who;
+
if ($pattern) {
if ($pattern) {
- $hint =
"m{\\Q$pattern\\E}i"
;
+ $hint =
q{m{\Q$pattern\E}i}
;
} else {
} else {
- $hint =
"!m{ann|rcmd|talk}"
;
+ $hint =
q{!m{\^(?:ann|rcmd|talk|chat)\^}}
;
}
if ($who) {
$hint .= ' && ' if $hint;
}
if ($who) {
$hint .= ' && ' if $hint;
- $hint .=
'm{\\Q$who\\E}i'
;
+ $hint .=
q{m{\Q$who\E}oi}
;
}
$hint = "next unless $hint" if $hint;
}
$hint = "next unless $hint" if $hint;
- $hint .= ";
next unless /^\\d+\\^$pattern\\^/
" if $pattern;
+ $hint .= ";
next unless m{^\\d+\\^$pattern\\^}
" if $pattern;
$hint ||= "";
$eval = qq(while (<\$fh>) {
$hint;
chomp;
$hint ||= "";
$eval = qq(while (<\$fh>) {
$hint;
chomp;
- push \@tmp, \$_;
+ # say "line: \$_";
+ push \@in, \$_;
+ last L1 if \@in >= $tot;
} );
} );
+ if (isdbg('search')) {
+ dbg("sh/log hint: $hint");
+ dbg("sh/log eval: $eval");
+ }
+
$fcb->close; # close any open files
$fcb->close; # close any open files
- my $fh = $fcb->open($jdate);
- L1: for (;@in < $to;) {
+ my $months;
+ my $fh;
+ if ($readback) {
+ my $fn = $fcb->fn($jdate);
+ $fh = IO::File->new("$readback $fn |");
+ } else {
+ $fh = $fcb->open($jdate);
+ }
+ L1: for ($months = 0; $fh && $months < $maxmonths && @in < $tot; $months++) {
my $ref;
my $ref;
+
if ($fh) {
my @tmp;
eval $eval; # do the search on this file
return ("Log search error", $@) if $@;
if ($fh) {
my @tmp;
eval $eval; # do the search on this file
return ("Log search error", $@) if $@;
- @in = (@tmp, @in);
- if (@in > $to) {
- @in = splice @in, -$to, $to;
- last L1;
- }
}
}
- $fh = $fcb->openprev(); # get the next file
- last if !$fh;
+
+ if ($readback) {
+ my $fn = $fcb->fn($jdate->sub(1));
+ $fh = IO::File->new("$readback $fn |");
+ } else {
+ $fh = $fcb->openprev(); # get the next file
+ }
}
}
- for (@in) {
+
+ unless (@in) {
+ my $name = $pattern ? $pattern : "log";
+ my $s = "$who "|| '';
+ return "show/$name: ${s}not found";
+ }
+
+ for (reverse @in) {
my @line = split /\^/ ;
push @out, print_item(\@line);
my @line = split /\^/ ;
push @out, print_item(\@line);
@@
-88,6
+117,7
@@
sub print
return @out;
}
return @out;
}
+
#
# the standard log printing interpreting routine.
#
#
# the standard log printing interpreting routine.
#
@@
-105,18
+135,20
@@
sub print_item
my $s = 'undef';
if ($r->[1] eq 'rcmd') {
my $s = 'undef';
if ($r->[1] eq 'rcmd') {
+ $r->[6] ||= 'Unknown';
if ($r->[2] eq 'in') {
$r->[5] ||= "";
if ($r->[2] eq 'in') {
$r->[5] ||= "";
- $s = "
$r->[4] (
priv: $r->[3]) rcmd: $r->[5]";
+ $s = "
in: $r->[4] ($r->[6]
priv: $r->[3]) rcmd: $r->[5]";
} else {
$r->[4] ||= "";
} else {
$r->[4] ||= "";
- $s = "$r->[3] reply: $r->[4]";
+ $s = "$r->[3]
$r->[6]
reply: $r->[4]";
}
} elsif ($r->[1] eq 'talk') {
$r->[5] ||= "";
$s = "$r->[3] -> $r->[2] ($r->[4]) $r->[5]";
}
} elsif ($r->[1] eq 'talk') {
$r->[5] ||= "";
$s = "$r->[3] -> $r->[2] ($r->[4]) $r->[5]";
- } elsif ($r->[1] eq 'ann') {
+ } elsif ($r->[1] eq 'ann'
|| $r->[1] eq 'chat'
) {
$r->[4] ||= "";
$r->[4] ||= "";
+ $r->[4] =~ s/^\#\d+ //;
$s = "$r->[3] -> $r->[2] $r->[4]";
} else {
$r->[2] ||= "";
$s = "$r->[3] -> $r->[2] $r->[4]";
} else {
$r->[2] ||= "";