projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NG auth: fix new customer, remove mapsecrets support, RT#21563
[freeside.git]
/
FS
/
bin
/
freeside-cdr-sftp_and_import
diff --git
a/FS/bin/freeside-cdr-sftp_and_import
b/FS/bin/freeside-cdr-sftp_and_import
index
ba9d6f3
..
c37ff11
100755
(executable)
--- 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 strict;
use Getopt::Std;
+use Date::Format;
use Net::SFTP::Foreign::Compat;
use Net::FTP;
use FS::UID qw(adminsuidsetup datasrc);
use Net::SFTP::Foreign::Compat;
use Net::FTP;
use FS::UID qw(adminsuidsetup datasrc);
@@
-11,8
+12,8
@@
use FS::cdr;
# parse command line
###
# parse command line
###
-use vars qw( $opt_m $opt_p $opt_r $opt_e $opt_d $opt_v $opt_P $opt_a );
-getopts('
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 =~ /^\./;
$opt_e ||= 'csv';
#$opt_e = ".$opt_e" unless $opt_e =~ /^\./;
@@
-20,6
+21,8
@@
$opt_e =~ s/^\.//;
$opt_p ||= '';
$opt_p ||= '';
+die "invalid cdrtypenum" if $opt_c && $opt_c !~ /^\d+$/;
+
my %options = ();
my $user = shift or die &usage;
my %options = ();
my $user = shift or die &usage;
@@
-91,29
+94,57
@@
foreach my $filename ( @$ls ) {
}
warn "Processing $filename\n" if $opt_v;
}
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 $error = FS::cdr::batch_import( {
- 'file' => "$cachedir/$filename",
+ my $file_timestamp = $filename.'-'.time2str('%Y-%m-%d', time);
+
+ my $import_options = {
+ 'file' => "$cachedir/$ungziped",
'format' => $format,
'format' => $format,
- 'batch_namevalue' => $file
name
,
+ 'batch_namevalue' => $file
_timestamp
,
'empty_ok' => 1,
'empty_ok' => 1,
- } );
- die $error if $error;
+ };
+ $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();
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();
}
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/$filename";
+ unlink "$cachedir/$ungziped" if $opt_g;
}
}
@@
-130,12
+161,12
@@
use vars qw( $sftp $ftp );
sub ftp {
return $ftp if $ftp && $ftp->pwd;
sub ftp {
return $ftp if $ftp && $ftp->pwd;
- my ($hostname, $user) = reverse split('@', $servername);
- my ($
user, $pass) = split(':', $user
);
+ my ($hostname, $user
pass
) = reverse split('@', $servername);
+ my ($
ftp_user, $ftp_pass) = split(':', $userpass
);
my $ftp = Net::FTP->new($hostname, %options)
or die "FTP connection to '$hostname' failed.";
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;
}
$ftp->cwd($opt_r) or die "can't chdir to $opt_r\n" if $opt_r;
return $ftp;
}
@@
-155,13
+186,13
@@
sub sftp {
=head1 NAME
=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
cdr.sftp_and_import [ -m method ] [ -p prefix ] [ -e extension ]
[ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
=head1 SYNOPSIS
cdr.sftp_and_import [ -m method ] [ -p prefix ] [ -e extension ]
[ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
- [ -a ] user format [sftpuser@]servername
+ [ -a ]
[ -c cdrtypenum ]
user format [sftpuser@]servername
=head1 DESCRIPTION
=head1 DESCRIPTION
@@
-185,6
+216,10
@@
or FTP and then import them into the database.
-v: set verbosity level; this script only has one level, but it will
be passed as the 'debug' argument to the transport method
-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
+
user: freeside username
format: CDR format name
user: freeside username
format: CDR format name