From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 1 Jul 2014 01:46:05 +0000 (-0700)
Subject: use a separate table for freesidestatus for IVR imports, RT#39055
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=960e5018d7e63f96f57fed4a56a2c1b700e8a64e

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 ca6ae936c..a97472e7a 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;