X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fgrepdbg;h=06f7df635d630e44944a7154cc6243e2038e4823;hb=78fcd88c563bc8f05c9f590cdfc0739129c7efda;hp=f133a143448972d0e75e5f019fb9015665ef77ff;hpb=f6abc902d49e13eeca3ff50f84a74f28a3aa3390;p=spider.git

diff --git a/perl/grepdbg b/perl/grepdbg
index f133a143..06f7df63 100755
--- a/perl/grepdbg
+++ b/perl/grepdbg
@@ -5,7 +5,6 @@
 #
 # grepdbg [nn] [-mm] <regular expression>
 #
-
 # nn - is the day you what to look at: 1 is yesterday, 0 is today
 # and is optional if there is only one argument
 #
@@ -13,7 +12,14 @@
 # ten lines including the line matching the regular expression. 
 #
 # <regexp> is the regular expression you are searching for, 
-# a caseless search is done
+# a caseless search is done. There can be more than one <regexp>
+# a <regexp> preceeded by a '!' is treated as NOT <regexp>. Each
+# <regexp> is implcitly ANDed together. 
+#
+# If you specify something that likes a filename and that filename
+# has a .pm on the end of it and it exists then rather than doing
+# the regex match it executes the "main::handle()" function passing
+# it one line at a time.
 #
 #
 
@@ -43,8 +49,9 @@ $fp = DXLog::new('debug', 'dat', 'd');
 $today = $fp->unixtoj(time()); 
 my $nolines = 1;
 my @prev;
+my @patt;
 
-for my $arg (@ARGV) {
+foreach my $arg (@ARGV) {
 	if ($arg =~ /^-/) {
 		$arg =~ s/^-//o;
 		if ($arg =~ /^\s*\-+(?:[h\?]e?l?p?)/) {
@@ -54,25 +61,43 @@ for my $arg (@ARGV) {
 		push @list, $arg;
 	} elsif ($arg =~ /^\d+$/) {
 		$nolines = $arg;
+	} elsif ($arg =~ /\.pm$/) {
+		if (-e $arg) {
+			my $fn = $arg;
+			$fn =~ s/\.pm$//;
+			eval { require $arg};
+			die "requiring $fn failed $@" if $@;
+		} else {
+			die "$arg not found";
+		}
 	} else {
-		$string = $arg;
-		last;
+		push @patt, $arg;
 	}
 }
 
-$string ||= '.*';
+push @patt, '.*' unless @patt;
 
 push @list, "0" unless @list;
 for my $entry (@list) {
 	my $now = $today->sub($entry); 
 	my $fh = $fp->open($now); 
 	my $line;
+	my $do;
+
+	if (main->can('handle')) {
+		$do = \&handle;
+	} else {
+		$do = \&process;
+	}
+
+	begin() if main->can('begin');
 	if ($fh) {
 		while (<$fh>) {
-			process($_);
+			&$do($_);
 		}
 		$fp->close();
 	}
+	end() if main->can('end');
 }
 
 sub process
@@ -81,11 +106,22 @@ sub process
 	chomp $line;
 	push @prev, $line;
 	shift @prev while @prev > $nolines;
-	if ($line =~ m{$string}io) {
+	my $flag = 0;
+	foreach my $p (@patt) {
+		if ($p =~ /^!/) {
+			my $r = substr $p, 1;
+			last if $line =~ m{$r}i;
+		} else {
+			last unless $line =~ m{$p}i;
+		}
+		++$flag;
+	}		
+	if ($flag == @patt) {
 		for (@prev) {
 			s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
 			my ($t, $l) =  split /\^/, $_, 2;
-			print atime($t), ' ', $l, "\n"; 
+			print atime($t), ' ', $l, "\n";
+			print '----------------' if $nolines > 1;
 		}
 		@prev = ();
 	}
@@ -93,6 +129,6 @@ sub process
 	
 sub usage
 {
-	die "usage: grepdbg [nn] [[-nnn] ..] <regexp>\n";
+	die "usage: grepdbg [nn days before] [-nnn lines before] [<perl file name>] [<regexp>|!<regexp>]...\n";
 }
 exit(0);