projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: return fields for customer_info, RT#84796
[freeside.git]
/
bin
/
aradial-sftp_and_import
diff --git
a/bin/aradial-sftp_and_import
b/bin/aradial-sftp_and_import
index
778ee23
..
e763963
100755
(executable)
--- a/
bin/aradial-sftp_and_import
+++ b/
bin/aradial-sftp_and_import
@@
-4,9
+4,11
@@
use strict;
use Getopt::Std;
use strict;
use Getopt::Std;
+use Date::Parse;
use Date::Format;
use Text::CSV_XS;
use DBI qw( :sql_types );
use Date::Format;
use Text::CSV_XS;
use DBI qw( :sql_types );
+use FS::DBI;
use Net::SFTP::Foreign;
#use FS::UID qw( adminsuidsetup datasrc );
use Net::SFTP::Foreign;
#use FS::UID qw( adminsuidsetup datasrc );
@@
-65,7
+67,7
@@
our %status_type = (
###
use vars qw( $opt_m $opt_a $opt_b $opt_r $opt_d $opt_v $opt_P );
###
use vars qw( $opt_m $opt_a $opt_b $opt_r $opt_d $opt_v $opt_P );
-getopts('m:abr:dP:v:');
+getopts('m:abr:d
:
P:v:');
my %options = ();
my %options = ();
@@
-80,8
+82,8
@@
mkdir $cachedir unless -d $cachedir;
my $servername = shift or die &usage;
my( $datasrc, $db_user, $db_pass ) = ( shift, shift, shift );
my $servername = shift or die &usage;
my( $datasrc, $db_user, $db_pass ) = ( shift, shift, shift );
-my $dbh = DBI->connect( $datasrc, $db_user, $db_pass)
- or die "can't connect: $DBI::errstr\n";
+my $dbh =
FS::
DBI->connect( $datasrc, $db_user, $db_pass)
+ or die "can't connect: $
FS::
DBI::errstr\n";
my $csv = Text::CSV_XS->new;
my $csv = Text::CSV_XS->new;
@@
-162,6
+164,8
@@
foreach my $filename ( @$ls ) {
#skip blank records
next unless grep defined($_), values %dbhash;
#skip blank records
next unless grep defined($_), values %dbhash;
+ my $date = time2str( '%Y-%m-%d %X', str2time( $hash{'Date'} ) );
+
$hash{'Status-Type'} = $status_type{ $hash{'Status-Type'} }
if exists $status_type{ $hash{'Status-Type'} };
$hash{'Status-Type'} = $status_type{ $hash{'Status-Type'} }
if exists $status_type{ $hash{'Status-Type'} };
@@
-169,7
+173,8
@@
foreach my $filename ( @$ls ) {
my @extra_values = ();
if ( $hash{'Status-Type'} eq 'Start' ) {
my @extra_values = ();
if ( $hash{'Status-Type'} eq 'Start' ) {
- $dbhash{'AcctStartTime'} = $hash{'Date'};
+ push @keys, 'AcctStartTime';
+ $dbhash{'AcctStartTime'} = $date;
$sql = 'INSERT INTO radacct ( '. join(',', @keys).
' ) VALUES ( '. join(',', map ' ? ', @keys ). ' )';
$sql = 'INSERT INTO radacct ( '. join(',', @keys).
' ) VALUES ( '. join(',', map ' ? ', @keys ). ' )';
@@
-177,7
+182,9
@@
foreach my $filename ( @$ls ) {
} elsif ( $hash{'Status-Type'} eq 'Stop' ) {
my $AcctSessionId = delete($dbhash{AcctSessionId});
} elsif ( $hash{'Status-Type'} eq 'Stop' ) {
my $AcctSessionId = delete($dbhash{AcctSessionId});
- $dbhash{'AcctStopTime'} = $hash{'Date'};
+
+ push @keys, 'AcctStopTime';
+ $dbhash{'AcctStopTime'} = $date;
push @extra_values, $AcctSessionId;
push @extra_values, $AcctSessionId;