[freeside-commits] branch master updated. 57a9a48d9a56255a3a05821c0090acac6c1f0336

[Ivan]

The branch, master has been updated
       via  57a9a48d9a56255a3a05821c0090acac6c1f0336 (commit)
       via  e9f160b9f019b82fd5a8cc630fa92943a52af1d2 (commit)
      from  bd86f39993db7511cb71a66c11ed56f5fa48be28 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 57a9a48d9a56255a3a05821c0090acac6c1f0336
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue May 7 18:29:13 2013 -0700

    add -s flag to skip CDR files that error out, RT#20763

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index 722bf73..a7452e8 100755
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -120,7 +120,7 @@ foreach my $filename ( @$ls ) {
   if ( $error ) {
 
     if ( $opt_s ) {
-      warn "$ungzipped: $error\n";
+      warn "$ungziped: $error\n";
     } else {
       unlink "$cachedir/$filename";
       unlink "$cachedir/$ungziped" if $opt_g;

commit e9f160b9f019b82fd5a8cc630fa92943a52af1d2
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue May 7 18:28:47 2013 -0700

    add -s flag to skip CDR files that error out, RT#20763

diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import
index 9aacd67..722bf73 100755
--- a/FS/bin/freeside-cdr-sftp_and_import
+++ b/FS/bin/freeside-cdr-sftp_and_import
@@ -116,31 +116,39 @@ foreach my $filename ( @$ls ) {
   $import_options->{'cdrtypenum'} = $opt_c if $opt_c;
   
   my $error = FS::cdr::batch_import($import_options);
+
   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/$file_timestamp")
-        or do {
-          unlink "$cachedir/$filename";
-          unlink "$cachedir/$ungziped" if $opt_g;
-          die "Can't move $filename to $opt_d: ".$ftp->message . "\n";
-        };
+    if ( $opt_s ) {
+      warn "$ungzipped: $error\n";
+    } else {
+      unlink "$cachedir/$filename";
+      unlink "$cachedir/$ungziped" if $opt_g;
+      die $error;
     }
-    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";
-        };
+
+  } 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";

-----------------------------------------------------------------------

Summary of changes:
 FS/bin/freeside-cdr-sftp_and_import |   50 ++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 21 deletions(-)