projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c4b8a3
)
use a separate table for freesidestatus for IVR imports, RT#39055
author
Ivan Kohler
<ivan@freeside.biz>
Tue, 1 Jul 2014 01:46:05 +0000
(18:46 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Tue, 1 Jul 2014 01:46:05 +0000
(18:46 -0700)
FS/FS/cdr/Import.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cdr/Import.pm
b/FS/FS/cdr/Import.pm
index
ca6ae93
..
a97472e
100644
(file)
--- 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 @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};
$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};
$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;
#print "$pkey_value\n" if $opt{v};
my $error = $cdr->insert;