[freeside-commits] freeside/FS/bin freeside-cdr-sftp_and_import, 1.13, 1.14

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv5201

Modified Files:
	freeside-cdr-sftp_and_import 
Log Message:
add datestamp to batch name derived from filename, remove temp files for all errors that abort processing, RT#14385

Index: freeside-cdr-sftp_and_import
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-cdr-sftp_and_import,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -d -r1.13 -r1.14
--- freeside-cdr-sftp_and_import	22 Sep 2011 00:28:29 -0000	1.13
+++ freeside-cdr-sftp_and_import	22 Sep 2011 00:32:13 -0000	1.14
@@ -2,7 +2,7 @@
 
 use strict;
 use Getopt::Std;
-use Date::Format qw(str2time);
+use Date::Format;
 use Net::SFTP::Foreign::Compat;
 use Net::FTP;
 use FS::UID qw(adminsuidsetup datasrc);
@@ -108,7 +108,7 @@
   my $import_options = {
     'file'            => "$cachedir/$ungziped",
     'format'          => $format,
-    'batch_namevalue' => $filename.'-'.str2time('%Y-%m-%d'),
+    'batch_namevalue' => $filename.'-'.time2str('%Y-%m-%d', time),
     'empty_ok'        => 1,
   };
   $import_options->{'cdrtypenum'} = $opt_c if $opt_c;