merged back NEW_ROUTE into trunk

[spider.git] / perl / DXLog.pm

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index dde723027f5b237afd735c4452eeafd1b7a42a02..80336e3e063313c57a480c10b60fc7ef66217deb 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -27,13 +27,13 @@ package DXLog;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(Log);
+@EXPORT = qw(Log Logclose);
 
-use FileHandle;
+use IO::File;
 use DXVars;
-use DXDebug ();
 use DXUtil;
 use Julian;
+
 use Carp;
 
 use strict;
@@ -53,7 +53,7 @@ sub new
        $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;
 }
 
@@ -75,7 +75,7 @@ sub open
        $mode = 'r' if !$mode;
        $self->{mode} = $mode;
        
-       my $fh = new FileHandle $self->{fn}, $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;
@@ -83,11 +83,21 @@ sub open
        $self->{year} = $year;
        $self->{thing} = $thing;
        
-       DXDebug::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
 {
@@ -161,7 +171,14 @@ sub close
 {
        my $self = shift;
        undef $self->{fh};                      # close the filehandle
-       delete $self->{fh};
+       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 
@@ -174,10 +191,8 @@ sub Log
        $log->writeunix($t, join('^', $t, @_) );
 }
 
-sub DESTROY                                            # catch undefs and do what is required further down the tree
+sub Logclose
 {
-       my $self = shift;
-       DXDebug::dbg("dxlog", "closing $self->{fn}\n");
-       undef $self->{fh} if defined $self->{fh};
-} 
+       $log->close();
+}
 1;