X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdr-sftp_and_import;h=7f2693fcb65d84c728df152d479eb655a7caaf61;hb=0d9c40c559dbead3fb742fe3b7d40df29f28b333;hp=384f9e57c910790ff306596575eaa03f94bed8a6;hpb=4a62363bef9734758dc246de66440037e3cc77f7;p=freeside.git

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index 384f9e57c..7f2693fcb 100755
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -2,6 +2,7 @@
 
 use strict;
 use Getopt::Std;
+use Date::Format;
 use Net::SFTP::Foreign::Compat;
 use Net::FTP;
 use FS::UID qw(adminsuidsetup datasrc);
@@ -11,8 +12,8 @@ use FS::cdr;
 # parse command line
 ###
 
-use vars qw( $opt_m $opt_p $opt_r $opt_e $opt_d $opt_v $opt_P $opt_a $opt_c );
-getopts('c:m:p:r:e:d:v:P:a');
+use vars qw( $opt_m $opt_p $opt_r $opt_e $opt_d $opt_v $opt_P $opt_a $opt_c $opt_g );
+getopts('c:m:p:r:e:d:v:P:ag');
 
 $opt_e ||= 'csv';
 #$opt_e = ".$opt_e" unless $opt_e =~ /^\./;
@@ -93,32 +94,57 @@ foreach my $filename ( @$ls ) {
   }
 
   warn "Processing $filename\n" if $opt_v;
+ 
+  my $ungziped = $filename;
+  $ungziped =~ s/\.gz$//;
+  if ( $opt_g ) {
+      if(system('gunzip', "$cachedir/$filename") != 0) {
+        warn "gunzip of '$cachedir/$filename' failed" if $opt_v;
+        unlink "$cachedir/$filename";
+        next;
+      }
+  }
+
+  my $file_timestamp = $filename.'-'.time2str('%Y-%m-%d', time);
 
   my $import_options = {
-    'file'            => "$cachedir/$filename",
+    'file'            => "$cachedir/$ungziped",
     'format'          => $format,
-    'batch_namevalue' => $filename,
+    'batch_namevalue' => $file_timestamp,
     'empty_ok'        => 1,
   };
   $import_options->{'cdrtypenum'} = $opt_c if $opt_c;
   
   my $error = FS::cdr::batch_import($import_options);
-  die $error if $error;
+  if ( $error ) {
+    unlink "$cachedir/$filename";
+    unlink "$cachedir/$ungziped" if $opt_g;
+    die $error;
+  }
 
   if ( $opt_d ) {
     if($opt_m eq 'ftp') {
       my $ftp = ftp();
-      $ftp->rename($filename, "$opt_d/$filename")
-        or die "Can't move $filename to $opt_d: ".$ftp->message . "\n";
+      $ftp->rename($filename, "$opt_d/$file_timestamp")
+        or do {
+          unlink "$cachedir/$filename";
+          unlink "$cachedir/$ungziped" if $opt_g;
+          die "Can't move $filename to $opt_d: ".$ftp->message . "\n";
+        };
     }
     else {
       my $sftp = sftp();
-      $sftp->rename($filename, "$opt_d/$filename")
-        or die "can't move $filename to $opt_d: ". $sftp->error . "\n";
+      $sftp->rename($filename, "$opt_d/$file_timestamp")
+        or do {
+          unlink "$cachedir/$filename";
+          unlink "$cachedir/$ungziped" if $opt_g;
+          die "can't move $filename to $opt_d: ". $sftp->error . "\n";
+        };
     }
   }
 
   unlink "$cachedir/$filename";
+  unlink "$cachedir/$ungziped" if $opt_g;
 
 }
 
@@ -135,12 +161,12 @@ use vars qw( $sftp $ftp );
 sub ftp {
   return $ftp if $ftp && $ftp->pwd;
   
-  my ($hostname, $user) = reverse split('@', $servername);
-  my ($user, $pass) = split(':', $user);
+  my ($hostname, $userpass) = reverse split('@', $servername);
+  my ($ftp_user, $ftp_pass) = split(':', $userpass);
 
   my $ftp = Net::FTP->new($hostname, %options) 
     or die "FTP connection to '$hostname' failed.";
-  $ftp->login($user, $pass) or die "FTP login failed: ".$ftp->message;
+  $ftp->login($ftp_user, $ftp_pass) or die "FTP login failed: ".$ftp->message;
   $ftp->cwd($opt_r) or die "can't chdir to $opt_r\n" if $opt_r;
   return $ftp;
 }