1. tidy up AUTOLOAD

[spider.git] / perl / DXMsg.pm

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 43a1207b0cba797ca3a6dcde3d37974316580f48..5773c7e966b463b6f43397f525a2d3ad828f1e42 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -522,7 +522,7 @@ sub store
                        my $rr = $ref->{rrreq} ? '1' : '0';
                        my $priv = $ref->{private} ? '1': '0';
                        my $del = $ref->{delete} ? '1' : '0';
-                       my $delt = $ref->{deletetime} || '0';
+                       my $delt = $ref->{deletetime} || ($ref->{t} + $maxage);
                        my $keep = $ref->{keep} || '0';
                        print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr^$del^$delt^$keep\n";
                        print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
@@ -1518,7 +1518,6 @@ sub import_one
 #no strict;
 sub AUTOLOAD
 {
-       my $self = shift;
        no strict;
        my $name = $AUTOLOAD;
        return if $name =~ /::DESTROY$/;
@@ -1528,9 +1527,7 @@ sub AUTOLOAD
        # this clever line of code creates a subroutine which takes over from autoload
        # from OO Perl - Conway
        *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
-       &$AUTOLOAD($self, @_);
-#      *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
-#      @_ ? $self->{$name} = shift : $self->{$name} ;
+       goto &$AUTOLOAD;
 }
 
 1;