X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fwatchdbg;h=84a74c8fd399a0d6644658605d6e735b79968bf4;hb=2f9d089ec33dd606824c11a508dbc06a0cf8dfaa;hp=dec397091dba07d826dbc7e7eb887c8a0a98d0ca;hpb=7404ef390b4c7408e9aa3584e4b69ed800845996;p=spider.git

diff --git a/perl/watchdbg b/perl/watchdbg
index dec39709..84a74c8f 100755
--- a/perl/watchdbg
+++ b/perl/watchdbg
@@ -11,6 +11,7 @@
 #
 
 require 5.004;
+package main;
 
 # search local then perl directories
 BEGIN {
@@ -22,6 +23,8 @@ BEGIN {
 	unshift @INC, "$root/local";
 }
 
+$data = "$root/data";
+
 use IO::File;
 use DXVars;
 use DXUtil;
@@ -30,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;
 
@@ -57,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;
 		}
 	}
 }
@@ -77,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);