Merge branch 'newpc92timings' of /scm/spider into newpc92timings

[spider.git] / perl / DXLog.pm

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index 748df39c782990d8216583f4c39782e1da3d6beb..171b9373d9dacf379ed2bbe802049bb6760413bf 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -20,14 +20,14 @@
 # 
 # Copyright (c) - 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXLog;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(Log Logclose);
+@EXPORT = qw(Log LogDbg Logclose);
 
 use IO::File;
 use DXVars;
@@ -37,6 +37,7 @@ use Julian;
 use Carp;
 
 use strict;
+
 use vars qw($log);
 
 $log = new('log', 'dat', 'm');
@@ -85,15 +86,14 @@ sub open
        
        $mode = 'r' if !$mode;
        $self->{mode} = $mode;
+       $self->{jdate} = $jdate;
        
        my $fh = new IO::File $self->{fn}, $mode, 0666;
        return undef if !$fh;
        $fh->autoflush(1) if $mode ne 'r'; # make it autoflushing if writable
        $self->{fh} = $fh;
 
-       $self->{jdate} = $jdate;
-       
-#      DXDebug::dbg("opening $self->{fn}\n") if isdbg("dxlog");
+#      print "opening $self->{fn}\n";
        
        return $self->{fh};
 }
@@ -149,7 +149,7 @@ sub write($$$)
        if (!$self->{fh} || 
                $self->{mode} ne ">>" || 
                $jdate->year != $self->{jdate}->year || 
-               $jdate->thing != $self->{jdate}->year) {
+               $jdate->thing != $self->{jdate}->thing) {
                $self->open($jdate, ">>") or confess "can't open $self->{fn} $!";
        }
 
@@ -198,6 +198,12 @@ sub Log
        $log->writeunix($t, join('^', $t, @_) );
 }
 
+sub LogDbg
+{
+       DXDebug::dbg($_) for @_;
+       Log(@_);
+}
+
 sub Logclose
 {
        $log->close();