X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLog.pm;h=80336e3e063313c57a480c10b60fc7ef66217deb;hb=9ffa482b325ca5b660a50e4bb845420cad17e969;hp=f73c3195a83285f47499a7728490934364f3bd55;hpb=ce0803e2110199eca1ad15cd6f66abde58cb949b;p=spider.git

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index f73c3195..80336e3e 100644
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -25,14 +25,21 @@
 
 package DXLog;
 
-use FileHandle;
+require Exporter;
+@ISA = qw(Exporter);
+@EXPORT = qw(Log Logclose);
+
+use IO::File;
 use DXVars;
-use DXDebug;
 use DXUtil;
 use Julian;
+
 use Carp;
 
 use strict;
+use vars qw($log);
+
+$log = new('log', 'dat', 'm');
 
 # create a log object that contains all the useful info needed
 # prefix is the main directory off of the data directory
@@ -43,10 +50,10 @@ sub new
 	my $ref = {};
 	$ref->{prefix} = "$main::data/$prefix";
 	$ref->{suffix} = $suffix if $suffix;
-	$ref->{sort} = $sort;
+	$ref->{'sort'} = $sort;
 		
 	# make sure the directory exists
-	mkdir($ref->{prefix}, 0777) if ! -e $ref->{prefix};
+	mkdir($ref->{prefix}, 0777) unless -e $ref->{prefix};
 	return bless $ref;
 }
 
@@ -59,16 +66,16 @@ sub open
 	if (defined $mode) {
 		my $dir = "$self->{prefix}/$year";
 		mkdir($dir, 0777) if ! -e $dir;
-		$self->{mode} = $mode;
-	} else {
-		delete $self->{mode};
 	}
 	
-	$self->{fn} = sprintf "$self->{prefix}/$year/%03d", $thing;
+	$self->{fn} = sprintf "$self->{prefix}/$year/%02d", $thing if $self->{'sort'} eq 'm';
+	$self->{fn} = sprintf "$self->{prefix}/$year/%03d", $thing if $self->{'sort'} eq 'd';
 	$self->{fn} .= ".$self->{suffix}" if $self->{suffix};
 	
 	$mode = 'r' if !$mode;
-	my $fh = new FileHandle $self->{fn}, $mode;
+	$self->{mode} = $mode;
+	
+	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;
@@ -76,18 +83,28 @@ sub open
 	$self->{year} = $year;
 	$self->{thing} = $thing;
 	
-	dbg("dxlog", "opening $self->{fn}\n");
+#	DXDebug::dbg("opening $self->{fn}\n") if isdbg("dxlog");
 	
 	return $self->{fh};
 }
 
+sub mtime
+{
+	my ($self, $year, $thing) = @_;
+	
+	my $fn = sprintf "$self->{prefix}/$year/%02d", $thing if $self->{'sort'} eq 'm';
+	$fn = sprintf "$self->{prefix}/$year/%03d", $thing if $self->{'sort'} eq 'd';
+	$fn .= ".$self->{suffix}" if $self->{suffix};
+	return (stat $fn)[9];
+}
+
 # open the previous log file in sequence
 sub openprev
 {
 	my $self = shift;
-	if ($self->{sort} eq 'm') {
+	if ($self->{'sort'} eq 'm') {
 		($self->{year}, $self->{thing}) = Julian::subm($self->{year}, $self->{thing}, 1);
-	} elsif ($self->{sort} eq 'd') {
+	} elsif ($self->{'sort'} eq 'd') {
 		($self->{year}, $self->{thing}) = Julian::sub($self->{year}, $self->{thing}, 1);
 	}
 	return $self->open($self->{year}, $self->{thing}, @_);
@@ -97,35 +114,55 @@ sub openprev
 sub opennext
 {
 	my $self = shift;
-	if ($self->{sort} eq 'm') {
+	if ($self->{'sort'} eq 'm') {
 		($self->{year}, $self->{thing}) = Julian::addm($self->{year}, $self->{thing}, 1);
-	} elsif ($self->{sort} eq 'd') {
+	} elsif ($self->{'sort'} eq 'd') {
 		($self->{year}, $self->{thing}) = Julian::add($self->{year}, $self->{thing}, 1);
 	}
 	return $self->open($self->{year}, $self->{thing}, @_);
 }
 
+# convert a date into the correct format from a unix date depending on its sort
+sub unixtoj
+{
+	my $self = shift;
+	
+	if ($self->{'sort'} eq 'm') {
+		return Julian::unixtojm(shift);
+	} elsif ($self->{'sort'} eq 'd') {
+		return Julian::unixtoj(shift);
+	}
+	confess "shouldn't get here";
+}
+
 # write (actually append) to a file, opening new files as required
 sub write
 {
 	my ($self, $year, $thing, $line) = @_;
-	$self->open($year, $thing, ">>") if (!$self->{fh} || 
-										 $self->{mode} ne ">>" || 
-										 $year != $self->{year} || 
-										 $thing != $self->{thing})
-		or confess "can't open $self->{fn} $!";
-
-	$self->{fh}->print("$line\n");
-	return $self;
+	if (!$self->{fh} || 
+		$self->{mode} ne ">>" || 
+		$year != $self->{year} || 
+		$thing != $self->{thing}) {
+		$self->open($year, $thing, ">>") or confess "can't open $self->{fn} $!";
+	}
+
+	return $self->{fh}->print("$line\n");
 }
 
 # write (actually append) using the current date to a file, opening new files as required
 sub writenow
 {
 	my ($self, $line) = @_;
-	my @date = unixtoj(time) if $self->{sort} = 'd';
-	@date = unixtojm(time) if $self->{sort} = 'm';
-	
+	my $t = time;
+	my @date = $self->unixtoj($t);
+	return $self->write(@date, $line);
+}
+
+# write (actually append) using a unix time to a file, opening new files as required
+sub writeunix
+{
+	my ($self, $t, $line) = @_;
+	my @date = $self->unixtoj($t);
 	return $self->write(@date, $line);
 }
 
@@ -134,14 +171,28 @@ sub close
 {
 	my $self = shift;
 	undef $self->{fh};			# close the filehandle
-	delete $self->{fh};
-	delete $self->{mode};
+	delete $self->{fh};	
 }
 
-sub DESTROY						# catch undefs and do what is required further do the tree
+sub DESTROY
 {
 	my $self = shift;
-	dbg("dxlog", "closing $self->{fn}\n");
-	undef $self->{fh} if defined $self->{fh};
-} 
+	undef $self->{fh};			# close the filehandle
+	delete $self->{fh} if $self->{fh};
+}
+
+# log something in the system log 
+# this routine is exported to any module that declares DXLog
+# it takes all its args and joins them together with the unixtime writes them out as one line
+# The user is responsible for making sense of this!
+sub Log
+{
+	my $t = time;
+	$log->writeunix($t, join('^', $t, @_) );
+}
+
+sub Logclose
+{
+	$log->close();
+}
 1;