X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Faradial-sftp_and_import;h=668ec49ba18ad0e99b3cb31c94ffbf7df3a14a0b;hb=5ea21368e57b35d34f20f876e6b93f16975afb78;hp=778ee2301381bc1148c92c800c231cc85790c4a1;hpb=e9f9e116024b0d59d4bc18b15abcc0caa8f2805e;p=freeside.git diff --git a/bin/aradial-sftp_and_import b/bin/aradial-sftp_and_import index 778ee2301..668ec49ba 100755 --- a/bin/aradial-sftp_and_import +++ b/bin/aradial-sftp_and_import @@ -4,6 +4,7 @@ use strict; use Getopt::Std; +use Date::Parse; use Date::Format; use Text::CSV_XS; use DBI qw( :sql_types ); @@ -65,7 +66,7 @@ our %status_type = ( ### 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 = (); @@ -162,6 +163,8 @@ foreach my $filename ( @$ls ) { #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'} }; @@ -169,7 +172,8 @@ foreach my $filename ( @$ls ) { 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 ). ' )'; @@ -177,7 +181,9 @@ foreach my $filename ( @$ls ) { } 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;