1. fixed problem with missing DXDebug in DXProt.

[spider.git] / perl / DXLog.pm

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index 5b5914b4e6b2472d5130d44b39c580bc67ff938e..c699413717534370ae4ab60536f75b1b8427931a 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -37,7 +37,6 @@ use Julian;
 use Carp;
 
 use strict;
-
 use vars qw($log);
 
 $log = new('log', 'dat', 'm');
@@ -51,7 +50,7 @@ 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};
@@ -72,7 +71,8 @@ sub open
                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;
@@ -93,9 +93,9 @@ sub open
 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}, @_);
@@ -105,9 +105,9 @@ 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}, @_);
@@ -118,9 +118,9 @@ sub unixtoj
 {
        my $self = shift;
        
-       if ($self->{sort} eq 'm') {
+       if ($self->{'sort'} eq 'm') {
                return Julian::unixtojm(shift);
-       } elsif ($self->{sort} eq 'd') {
+       } elsif ($self->{'sort'} eq 'd') {
                return Julian::unixtoj(shift);
        }
        confess "shouldn't get here";
@@ -144,7 +144,8 @@ sub write
 sub writenow
 {
        my ($self, $line) = @_;
-       my @date = $self->unixtoj(time);
+       my $t = time;
+       my @date = $self->unixtoj($t);
        return $self->write(@date, $line);
 }
 
@@ -171,10 +172,11 @@ sub close
 # The user is responsible for making sense of this!
 sub Log
 {
-       $log->writeunix($main::systime, join('^', $main::systime, @_) );
+       my $t = time;
+       $log->writeunix($t, join('^', $t, @_) );
 }
 
-sub DESTROY                                            # catch undefs and do what is required further do the tree
+sub DESTROY                                            # catch undefs and do what is required further down the tree
 {
        my $self = shift;
        DXDebug::dbg("dxlog", "closing $self->{fn}\n");