X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLog.pm;h=44abd5b6a6a73acf0798b969fae6ca21d0adec69;hb=f44ebfb22849652844e5c4ff4e2e583cb444c2b9;hp=c13e26c1d8ffac4b8c641802c1af75f1ede6643f;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index c13e26c1..44abd5b6 100644
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -27,7 +27,7 @@ package DXLog;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(Log Logclose);
+@EXPORT = qw(Log LogDbg Logclose);
 
 use IO::File;
 use DXVars;
@@ -39,10 +39,7 @@ use Carp;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use vars qw($log);
 
@@ -92,15 +89,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};
 }
@@ -156,7 +152,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} $!";
 	}
 
@@ -205,6 +201,12 @@ sub Log
 	$log->writeunix($t, join('^', $t, @_) );
 }
 
+sub LogDbg
+{
+	DXDebug::dbg($_) for @_;
+	Log(@_);
+}
+
 sub Logclose
 {
 	$log->close();