X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdr-sftp_and_import;h=aa4bf6471cb3aef939f14420c09bf08fff5e9207;hp=ab9d4a65829f7fc9ed204995d4dba576b43c05d9;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=8a20ba243bbcf659376037dbce3a05c0d7378e1c

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index ab9d4a658..aa4bf6471 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 $opt_g );
-getopts('c:m:p:r:e:d:v:P:ag');
+use vars qw( $opt_m $opt_p $opt_r $opt_e $opt_d $opt_v $opt_P $opt_a $opt_c $opt_g $opt_s $opt_b );
+getopts('c:m:p:r:e:d:v:P:agsb');
 
 $opt_e ||= 'csv';
 #$opt_e = ".$opt_e" unless $opt_e =~ /^\./;
@@ -95,7 +96,7 @@ foreach my $filename ( @$ls ) {
   warn "Processing $filename\n" if $opt_v;
  
   my $ungziped = $filename;
-  my $ungziped =~ s/\.gz$//;
+  $ungziped =~ s/\.gz$//;
   if ( $opt_g ) {
       if(system('gunzip', "$cachedir/$filename") != 0) {
         warn "gunzip of '$cachedir/$filename' failed" if $opt_v;
@@ -104,28 +105,50 @@ foreach my $filename ( @$ls ) {
       }
   }
 
+  my $file_timestamp = $filename.'-'.time2str('%Y-%m-%d', time);
+
   my $import_options = {
     '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 ( $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";
+  if ( $error ) {
+
+    if ( $opt_s ) {
+      warn "$ungziped: $error\n";
+    } else {
+      unlink "$cachedir/$filename";
+      unlink "$cachedir/$ungziped" if $opt_g;
+      die $error;
     }
-    else {
-      my $sftp = sftp();
-      $sftp->rename($filename, "$opt_d/$filename")
-        or die "can't move $filename to $opt_d: ". $sftp->error . "\n";
+
+  } else {
+
+    if ( $opt_d ) {
+      if ( $opt_m eq 'ftp') {
+        my $ftp = ftp();
+        $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/$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";
@@ -138,7 +161,11 @@ foreach my $filename ( @$ls ) {
 ###
 
 sub usage {
-  "Usage: \n  cdr.import user format servername\n";
+  "Usage:
+  cdr.sftp_and_import [ -m method ] [ -p prefix ] [ -e extension ] 
+    [ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
+    [ -a ] [ -g ] [ -s ] [ -c cdrtypenum ] user format [sftpuser@]servername
+  ";
 }
 
 use vars qw( $sftp $ftp );
@@ -146,13 +173,14 @@ 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;
+  $ftp->binary or die "can't set BINARY mode: ". $ftp->message if $opt_b;
   return $ftp;
 }
 
@@ -175,9 +203,9 @@ freeside-cdr-sftp_and_import - Download CDR files from a remote server via SFTP
 
 =head1 SYNOPSIS
 
-  cdr.sftp_and_import [ -m method ] [ -p prefix ] [ -e extension ] 
+  freeside-cdr-sftp_and_import [ -m method ] [ -p prefix ] [ -e extension ] 
     [ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
-    [ -a ] [ -c cdrtypenum ] user format [sftpuser@]servername
+    [ -a ] [ -g ] [ -s ] [ -c cdrtypenum ] user format [sftpuser@]servername
 
 =head1 DESCRIPTION
 
@@ -198,11 +226,17 @@ or FTP and then import them into the database.
 
 -a: use ftp passive mode
 
+-b: use ftp binary mode
+
 -v: set verbosity level; this script only has one level, but it will 
     be passed as the 'debug' argument to the transport method
 
 -c: cdrtypenum to set, defaults to none
 
+-g: File is gzipped
+
+-s: Warn and skip files which could not be imported rather than abort
+
 user: freeside username
 
 format: CDR format name