[freeside-commits] branch FREESIDE_3_BRANCH updated. d979d53c0a6fdec99bfd3bf9c6b246b14c101507

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  d979d53c0a6fdec99bfd3bf9c6b246b14c101507 (commit)
      from  e2ef13ff1681fef43744037fa0c89e04253f054b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d979d53c0a6fdec99bfd3bf9c6b246b14c101507
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Aug 31 13:11:35 2014 -0700

    fix inserts and don't generate extra noise on trailing blanks, RT#29053

diff --git a/bin/aradial-sftp_and_import b/bin/aradial-sftp_and_import
index cc2238e..b0878e2 100755
--- a/bin/aradial-sftp_and_import
+++ b/bin/aradial-sftp_and_import
@@ -157,6 +157,9 @@ foreach my $filename ( @$ls ) {
 
     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'} };
 
@@ -166,8 +169,8 @@ foreach my $filename ( @$ls ) {
 
       $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' ) {
 
@@ -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;
+      $value ||= 0 if $type == SQL_INTEGER;
       $sth->bind_param($p_num++, $value, $type);
     }
     foreach my $value ( @extra_values ) {

-----------------------------------------------------------------------

Summary of changes:
 bin/aradial-sftp_and_import |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)