1. protect against PC41s with field[3] == field[2]

[spider.git] / perl / grepdbg

diff --git a/perl/grepdbg b/perl/grepdbg
index a14bf3011d36489004359304b320af3b4baf73f4..55d09788b8c28bf0f3c4f220951567fb9262dd9c 100755 (executable)
--- a/perl/grepdbg
+++ b/perl/grepdbg
@@ -26,13 +26,14 @@ BEGIN {
 use DXVars;
 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;
 
@@ -51,8 +52,8 @@ die "usage: grepdbg [nn] [[-nnn] ..] <regexp>\n" unless  $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>) {
@@ -63,9 +64,8 @@ for my $entry (@list) {
                        if ($line =~ m{$string}io) {
                                for (@prev) {
                                        s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%02X", ord($1))/eg; 
-                                       my @line =  split '\^';
-                                       my $t = shift @line;
-                                       print atime($t), ' ', join('^', @line), "\n"; 
+                                       my ($t, $l) =  split /\^/, $line, 2;
+                                       print atime($t), ' ', $l, "\n"; 
                                }
                                @prev = ();
                        }