[freeside-commits] branch FREESIDE_3_BRANCH updated. 960e5018d7e63f96f57fed4a56a2c1b700e8a64e

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  960e5018d7e63f96f57fed4a56a2c1b700e8a64e (commit)
      from  3c4b8a30aa8b650795b6f74c587f57feab348ab6 (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 960e5018d7e63f96f57fed4a56a2c1b700e8a64e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 30 18:46:05 2014 -0700

    use a separate table for freesidestatus for IVR imports, RT#39055

diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index ca6ae93..a97472e 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -81,7 +81,7 @@ sub dbi_import {
   #      )
 
   #my @cols = values %{ $args{column_map} };
-  my $sql = "SELECT * FROM $table "; # join(',', @cols). " FROM $table ".
+  my $sql = "SELECT $table.* FROM $table "; # join(',', @cols). " FROM $table ".
   $sql .=  'LEFT JOIN '. $args{status_table}.
            " ON ( $table.$pkey = ". $args{status_table}. ".$pkey )"
     if $args{status_table};
@@ -117,8 +117,7 @@ sub dbi_import {
 
     $cdr->cdrtypenum($opt{c}) if $opt{c};
 
-    my $pkey_value = $args{status_table} ? $row->{"$table.$pkey"}
-                                         : $row->{$pkey};
+    my $pkey_value = $row->{$pkey};
 
     #print "$pkey_value\n" if $opt{v};
     my $error = $cdr->insert;

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

Summary of changes:
 FS/FS/cdr/Import.pm |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)