X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLog.pm;h=03dc42843ab162051bb19cac2eabaf78ed2f86bb;hb=ae1b5c3757a468d25dc183b8fd3be88985bb34f7;hp=6c2eeee99202992b4b8adc7c8ebaaed45afcdfa0;hpb=6a0068ec3df1dca0c6ae2714af3c0a4a62998dcf;p=spider.git

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index 6c2eeee9..03dc4284 100644
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -25,11 +25,164 @@
 
 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
+# sort is 'm' for monthly, 'd' for daily 
+sub new
+{
+	my ($prefix, $suffix, $sort) = @_;
+	my $ref = {};
+	$ref->{prefix} = "$main::data/$prefix";
+	$ref->{suffix} = $suffix if $suffix;
+	$ref->{'sort'} = $sort;
+		
+	# make sure the directory exists
+	mkdir($ref->{prefix}, 0777) unless -e $ref->{prefix};
+	return bless $ref;
+}
+
+# open the appropriate data file
+sub open
+{
+	my ($self, $year, $thing, $mode) = @_;
+	
+	# if we are writing, check that the directory exists
+	if (defined $mode) {
+		my $dir = "$self->{prefix}/$year";
+		mkdir($dir, 0777) if ! -e $dir;
+	}
+	
+	$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;
+	$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;
+
+	$self->{year} = $year;
+	$self->{thing} = $thing;
+	
+#	DXDebug::dbg("dxlog", "opening $self->{fn}\n");
+	
+	return $self->{fh};
+}
+
+# open the previous log file in sequence
+sub openprev
+{
+	my $self = shift;
+	if ($self->{'sort'} eq 'm') {
+		($self->{year}, $self->{thing}) = Julian::subm($self->{year}, $self->{thing}, 1);
+	} elsif ($self->{'sort'} eq 'd') {
+		($self->{year}, $self->{thing}) = Julian::sub($self->{year}, $self->{thing}, 1);
+	}
+	return $self->open($self->{year}, $self->{thing}, @_);
+}
+
+# open the next log file in sequence
+sub opennext
+{
+	my $self = shift;
+	if ($self->{'sort'} eq 'm') {
+		($self->{year}, $self->{thing}) = Julian::addm($self->{year}, $self->{thing}, 1);
+	} 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) = @_;
+	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 $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);
+}
+
+# close the log file handle
+sub close
+{
+	my $self = shift;
+	undef $self->{fh};			# close the filehandle
+	delete $self->{fh};	
+}
+
+sub DESTROY
+{
+	my $self = shift;
+	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;