projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e2ef13f
)
fix inserts and don't generate extra noise on trailing blanks, RT#29053
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 31 Aug 2014 20:11:35 +0000
(13:11 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 31 Aug 2014 20:11:35 +0000
(13:11 -0700)
bin/aradial-sftp_and_import
patch
|
blob
|
history
diff --git
a/bin/aradial-sftp_and_import
b/bin/aradial-sftp_and_import
index
cc2238e
..
b0878e2
100755
(executable)
--- a/
bin/aradial-sftp_and_import
+++ b/
bin/aradial-sftp_and_import
@@
-157,6
+157,9
@@
foreach my $filename ( @$ls ) {
my @keys = keys %dbhash;
my @keys = keys %dbhash;
+ #skip blank records
+ next unless grep defined($_), values %dbhash;
+
$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'} };
@@
-166,8
+169,8
@@
foreach my $filename ( @$ls ) {
$dbhash{'AcctStartTime'} = $hash{'Date'};
$dbhash{'AcctStartTime'} = $hash{'Date'};
- $sql = 'INSERT INTO radacct ( '
,
join(',', @keys).
- ' ) VALUES ( '.
map(
' ? ', @keys ). ' )';
+ $sql = 'INSERT INTO radacct ( '
.
join(',', @keys).
+ ' ) VALUES ( '.
join(',', map
' ? ', @keys ). ' )';
} elsif ( $hash{'Status-Type'} eq 'Stop' ) {
} elsif ( $hash{'Status-Type'} eq 'Stop' ) {
@@
-194,6
+197,7
@@
foreach my $filename ( @$ls ) {
foreach my $value ( map $dbhash{$_}, @keys ) {
my $key = shift @keys;
my $type = exists($bind_type{$key}) ? $bind_type{$key} : SQL_VARCHAR;
foreach my $value ( map $dbhash{$_}, @keys ) {
my $key = shift @keys;
my $type = exists($bind_type{$key}) ? $bind_type{$key} : SQL_VARCHAR;
+ $value ||= 0 if $type == SQL_INTEGER;
$sth->bind_param($p_num++, $value, $type);
}
foreach my $value ( @extra_values ) {
$sth->bind_param($p_num++, $value, $type);
}
foreach my $value ( @extra_values ) {