add an RBN line to progress

[spider.git] / perl / grepdbg

diff --git a/perl/grepdbg b/perl/grepdbg
index a59ea742340b5f121cd5a9352d226b5e8b873514..f133a143448972d0e75e5f019fb9015665ef77ff 100755 (executable)
--- a/perl/grepdbg
+++ b/perl/grepdbg
@@ -3,11 +3,17 @@
 # Program to do a grep with dates and times on the debug
 # files
 #
-# dispdbg [-nnn ...] <string>
+# grepdbg [nn] [-mm] <regular expression>
 #
-# the -nnn is the day you what to look at -1 is yesterday -0 is today
+
+# nn - is the day you what to look at: 1 is yesterday, 0 is today
 # and is optional if there is only one argument
-# <string> is the string, a caseless search is done
+#
+# -mmm - print the mmm lines before the match. So -10 will print
+# ten lines including the line matching the regular expression. 
+#
+# <regexp> is the regular expression you are searching for, 
+# a caseless search is done
 #
 #
 
@@ -23,22 +29,28 @@ BEGIN {
        unshift @INC, "$root/local";
 }
 
-use DXVars;
+use SysVar;
 use DXUtil;
 use DXLog;
+use Julian;
 
 use strict;
 
-use vars qw(@list $fp @today $string);
+use vars qw(@list $fp $today $string);
+
 
 $fp = DXLog::new('debug', 'dat', 'd');
-@today = Julian::unixtoj(time()); 
+$today = $fp->unixtoj(time()); 
 my $nolines = 1;
 my @prev;
 
 for my $arg (@ARGV) {
        if ($arg =~ /^-/) {
                $arg =~ s/^-//o;
+               if ($arg =~ /^\s*\-+(?:[h\?]e?l?p?)/) {
+                       usage();
+                       exit(0);
+               }
                push @list, $arg;
        } elsif ($arg =~ /^\d+$/) {
                $nolines = $arg;
@@ -47,28 +59,40 @@ for my $arg (@ARGV) {
                last;
        }
 }
-die "usage: grepdbg [nn] [[-nnn] ..] <regexp>\n" unless  $string;
+
+$string ||= '.*';
 
 push @list, "0" unless @list;
 for my $entry (@list) {
-       my @now = Julian::sub(@today, $entry); 
-       my $fh = $fp->open(@now); 
+       my $now = $today->sub($entry); 
+       my $fh = $fp->open($now); 
        my $line;
        if ($fh) {
                while (<$fh>) {
-                       my $line = $_;
-                       chomp $line;
-                       push @prev, $line;
-                       shift @prev while @prev > $nolines;
-                       if ($line =~ m{$string}io) {
-                               for (@prev) {
-                                       my @line =  split '\^';
-                                       my $t = shift @line;
-                                       print atime($t), ' ', join('^', @line), "\n"; 
-                               }
-                       }
+                       process($_);
                }
                $fp->close();
        }
 }
+
+sub process
+{
+       my $line = shift;
+       chomp $line;
+       push @prev, $line;
+       shift @prev while @prev > $nolines;
+       if ($line =~ m{$string}io) {
+               for (@prev) {
+                       s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
+                       my ($t, $l) =  split /\^/, $_, 2;
+                       print atime($t), ' ', $l, "\n"; 
+               }
+               @prev = ();
+       }
+}
+       
+sub usage
+{
+       die "usage: grepdbg [nn] [[-nnn] ..] <regexp>\n";
+}
 exit(0);