attempt to fix myalias/mycall external usurpation

[spider.git] / perl / DXLog.pm

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index ede817aa446fdae1dc89ae634488401206bc74d5..a332d39208336c26c5c9c012bc4a3a7b6ac6959a 100644 (file)
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -49,7 +49,8 @@ sub new
 {
        my ($prefix, $suffix, $sort) = @_;
        my $ref = bless {}, __PACKAGE__;
-       $ref->{prefix} = "$main::data/$prefix";
+       localdata_mv($prefix);
+       $ref->{prefix} = "$main::local_data/$prefix";
        $ref->{suffix} = $suffix if $suffix;
        $ref->{sort} = $sort;
        
@@ -100,6 +101,13 @@ sub open
        return $self->{fh};
 }
 
+sub fn
+{
+       my ($self, $jdate) = @_;
+       
+       return $self->_genfn($jdate);
+}
+
 sub delete($$)
 {
        my ($self, $jdate) = @_;
@@ -148,6 +156,7 @@ sub unixtoj($$)
 sub write($$$)
 {
        my ($self, $jdate, $line) = @_;
+       return unless $self && $jdate;
        if (!$self->{fh} || 
                $self->{mode} ne ">>" || 
                $jdate->year != $self->{jdate}->year || 
@@ -210,8 +219,12 @@ sub Log
 
 sub LogDbg
 {
-       DXDebug::dbg($_) for @_;
-       Log(@_);
+       my $cat = shift;
+       foreach my $m (@_) {
+               DXDebug::dbgsetcat($cat);
+               DXDebug::dbg($m);
+               Log($cat, $m);
+       }
 }
 
 sub Logclose