X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdr-sftp_and_import;h=7f2693fcb65d84c728df152d479eb655a7caaf61;hb=4f80f0d3db9bf0af3570c26ac3ae9da34a18f832;hp=039941c72e7eea212032b39de0afbe884cd4a1af;hpb=0cf20debd248e9d4d805ed0e8ab3580123fae622;p=freeside.git diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import index 039941c72..7f2693fcb 100755 --- a/FS/bin/freeside-cdr-sftp_and_import +++ b/FS/bin/freeside-cdr-sftp_and_import @@ -105,10 +105,12 @@ foreach my $filename ( @$ls ) { } } + my $file_timestamp = $filename.'-'.time2str('%Y-%m-%d', time); + my $import_options = { 'file' => "$cachedir/$ungziped", 'format' => $format, - 'batch_namevalue' => $filename.'-'.time2str('%Y-%m-%d', time), + 'batch_namevalue' => $file_timestamp, 'empty_ok' => 1, }; $import_options->{'cdrtypenum'} = $opt_c if $opt_c; @@ -123,7 +125,7 @@ foreach my $filename ( @$ls ) { if ( $opt_d ) { if($opt_m eq 'ftp') { my $ftp = ftp(); - $ftp->rename($filename, "$opt_d/$filename") + $ftp->rename($filename, "$opt_d/$file_timestamp") or do { unlink "$cachedir/$filename"; unlink "$cachedir/$ungziped" if $opt_g; @@ -132,7 +134,7 @@ foreach my $filename ( @$ls ) { } else { my $sftp = sftp(); - $sftp->rename($filename, "$opt_d/$filename") + $sftp->rename($filename, "$opt_d/$file_timestamp") or do { unlink "$cachedir/$filename"; unlink "$cachedir/$ungziped" if $opt_g;