X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?p=spider.git;a=blobdiff_plain;f=perl%2Fwatchdbg;fp=perl%2Fwatchdbg;h=79a72f600768c1e7a251e4ba13234592d032df40;hp=84a74c8fd399a0d6644658605d6e735b79968bf4;hb=4b207544da78b182bd12e94eab01451694749012;hpb=0bca43685143e42a93bdcdaa9e34e115b22552e9

diff --git a/perl/watchdbg b/perl/watchdbg
index 84a74c8f..79a72f60 100755
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -3,15 +3,18 @@
 # watch the end of the current debug file (like tail -f) applying
 # any regexes supplied on the command line.
 #
+# There can be more than one <regexp>. a <regexp> preceeded by a '!' is
+# treated as NOT <regexp>. Each <regexp> is implcitly ANDed together.
+# All <regexp> are caseless.
+#
 # examples:-
 # 
 #   watchdbg g1tlh       # watch everything g1tlh does
-#   watchdbg 2 PCPROT       # watch all PCPROT messages + up to 2 lines before
+#   watchdbg -2 PCPROT       # watch all PCPROT messages + up to 2 lines before
 #   watchdbg gb7baa gb7djk   # watch the conversation between BAA and DJK 
 #
 
 require 5.004;
-package main;
 
 # search local then perl directories
 BEGIN {
@@ -23,8 +26,6 @@ BEGIN {
 	unshift @INC, "$root/local";
 }
 
-$data = "$root/data";
-
 use IO::File;
 use DXVars;
 use DXUtil;
@@ -38,18 +39,28 @@ my $fh = $fp->open($today) or die $!;
 my $nolines = 1;
 $nolines = shift if $ARGV[0] =~ /^-?\d+$/;
 $nolines = abs $nolines if $nolines < 0;  
-my $exp = join '|', @ARGV;
+my @patt = @ARGV;
 my @prev;
 
 # seek to end of file
 $fh->seek(0, 2);
 for (;;) {
-	my $line = <$fh>;
+	my $line = $fh->getline;
 	if ($line) {
-		if ($exp) {
+		if (@patt) {
 			push @prev, $line;
 			shift @prev while @prev > $nolines; 
-			if ($line =~ m{(?:$exp)}oi) {
+			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) {
 				printit(@prev);	
 				@prev = ();
 			}
@@ -82,10 +93,8 @@ sub printit
 		chomp $line;
 		$line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
 		my ($t, $l) =  split /\^/, $line, 2;
-		my ($sec,$min,$hour) = gmtime((defined $t) ? $t : time);
-		my $buf = sprintf "%02d:%02d:%02d", $hour, $min, $sec;
-		
-		print $buf, ' ', $l, "\n"; 
+		$t = time unless defined $t;
+		printf "%02d:%02d:%02d %s\n", (gmtime($t))[2,1,0], $l;
 	}
 }
 exit(0);