From e4ceced95d8b5906d1589ffe7b5f778b6477f31e Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Fri, 26 May 2017 14:20:51 -0400
Subject: [PATCH] RT# 74523 - added check for status table argument for
/bin/cdr-ivr.import compatibility
---
FS/FS/cdr/Import.pm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index 35069ae28..f32a7bd85 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -71,6 +71,7 @@ sub dbi_import {
my $table = $opt{T} || $args{table};
my $pkey = $args{primary_key};
+ my $status_table = $opt{S} || $args{status_table};
#just doing this manually with IVR MSSQL databases for now
# # check for existence of freesidestatus
@@ -91,9 +92,9 @@ sub dbi_import {
#my @cols = values %{ $args{column_map} };
my $sql = "SELECT $table.* FROM $table "; # join(',', @cols). " FROM $table ".
- $sql .= 'LEFT JOIN '. $opt{S}.
- " ON ( $table.$pkey = ". $opt{S}. ".$pkey )"
- if $opt{S};
+ $sql .= 'LEFT JOIN '. $status_table.
+ " ON ( $table.$pkey = ". $status_table. ".$pkey )"
+ if $status_table;
$sql .= ' WHERE freesidestatus IS NULL ';
#$sql .= ' LIMIT '. $opt{L} if $opt{L};
@@ -141,10 +142,10 @@ sub dbi_import {
$imported++;
my $st_sql;
- if ( $opt{S} ) {
+ if ( $status_table ) {
$st_sql =
- 'INSERT INTO '. $opt{S}. " ( $pkey, freesidestatus ) ".
+ 'INSERT INTO '. $status_table. " ( $pkey, freesidestatus ) ".
" VALUES ( ?, 'done' )";
} else {
@@ -191,4 +192,4 @@ L<FS::cdr>
=cut
-1;
+1;
\ No newline at end of file
--
2.20.1