X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdr-sftp_and_import;h=1d052ea5c31fa53ccaefea73aa6e0f395b96eec4;hb=34f2a031405ba52afe98b52fc26da0654e29b201;hp=9a71ab96c354b9d4417302c01c464897b6daa043;hpb=7f4e4fddb595f5c825a18c88ed79029160650dc9;p=freeside.git diff --git a/FS/bin/freeside-cdr-sftp_and_import b/FS/bin/freeside-cdr-sftp_and_import index 9a71ab96c..1d052ea5c 100755 --- a/FS/bin/freeside-cdr-sftp_and_import +++ b/FS/bin/freeside-cdr-sftp_and_import @@ -11,8 +11,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,9 +93,19 @@ 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 $import_options = { - 'file' => "$cachedir/$filename", + 'file' => "$cachedir/$ungziped", 'format' => $format, 'batch_namevalue' => $filename, 'empty_ok' => 1, @@ -119,6 +129,7 @@ foreach my $filename ( @$ls ) { } unlink "$cachedir/$filename"; + unlink "$cachedir/$ungziped" if $opt_g; } @@ -160,7 +171,7 @@ sub sftp { =head1 NAME -cdr.sftp_and_import - Download CDR files from a remote server via SFTP +freeside-cdr-sftp_and_import - Download CDR files from a remote server via SFTP =head1 SYNOPSIS