X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fwatchdbg;h=84a74c8fd399a0d6644658605d6e735b79968bf4;hb=885bc3cf15da32c95eeff4e520d8f8ccc08946fa;hp=c1d6b172beb11a09f63e2c288c7596f152f770f4;hpb=78efbb74096d56939a9efcfecd0c5b93ba9e9741;p=spider.git

diff --git a/perl/watchdbg b/perl/watchdbg
index c1d6b172..84a74c8f 100755
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -6,10 +6,12 @@
 # examples:-
 # 
 #   watchdbg g1tlh       # watch everything g1tlh does
+#   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 {
@@ -21,6 +23,8 @@ BEGIN {
 	unshift @INC, "$root/local";
 }
 
+$data = "$root/data";
+
 use IO::File;
 use DXVars;
 use DXUtil;
@@ -29,10 +33,11 @@ use DXLog;
 use strict;
 
 my $fp = DXLog::new('debug', 'dat', 'd');
-my @today = Julian::unixtoj(time()); 
-my $fh = $fp->open(@today) or die $!; 
+my $today = $fp->unixtoj(time()); 
+my $fh = $fp->open($today) or die $!; 
 my $nolines = 1;
-$nolines = shift if $ARGV[0] =~ /^\d+$/;
+$nolines = shift if $ARGV[0] =~ /^-?\d+$/;
+$nolines = abs $nolines if $nolines < 0;  
 my $exp = join '|', @ARGV;
 my @prev;
 
@@ -56,16 +61,16 @@ for (;;) {
 		
 		# check that the debug hasn't rolled over to next day
 		# open it if it has
-		my @now = Julian::unixtoj(time()); 
-		if ($today[1] != $now[1]) {
+		my $now = $fp->unixtoj(time()); 
+		if ($today->cmp($now)) {
 			$fp->close;
 			my $i;
 			for ($i = 0; $i < 20; $i++) {
-				last if $fh = $fp->open(@now);
+				last if $fh = $fp->open($now);
 				sleep 5;
 			}
 		 	die $! if $i >= 20; 
-			@today = @now;
+			$today = $now;
 		}
 	}
 }
@@ -76,12 +81,11 @@ sub printit
 		my $line = shift;
 		chomp $line;
 		$line =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
-		my @line =  split '\^', $line;
-		my $t = shift @line;
+		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, ' ', join('^', @line), "\n"; 
+		print $buf, ' ', $l, "\n"; 
 	}
 }
 exit(0);