From 189f40043dc1e82373243acc73abd03f8151c87c Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 28 Jun 2014 00:51:44 -0700
Subject: [PATCH] use a separate table for freesidestatus for IVR imports,
RT#39055
---
FS/FS/cdr/Import.pm | 36 +++++++++++++++++++++++++++++-------
bin/cdr-ivr.import | 11 ++++++-----
2 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index 7a3775878..472e22062 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -74,11 +74,19 @@ sub dbi_import {
# else {
# print "freesidestatus column present\n";
# }
+ # or if using a status_table:
+ # CREATE TABLE FREESIDE_BILLING (
+ # BILLING_ID BIGINT,
+ # FREESIDESTATUS VARCHAR(32)
+ # )
#my @cols = values %{ $args{column_map} };
- my $sql = "SELECT * FROM $table ". # join(',', @cols). " FROM $table ".
+ my $sql = "SELECT * FROM $table "; # join(',', @cols). " FROM $table ".
+ $sql .= 'LEFT JOIN '. $args{status_table}.
+ ' USING ( '. $args{primary_key}. ' )'
+ if $args{status_table};
+ $sql .= ' WHERE freesidestatus IS NULL ';
- ' WHERE freesidestatus IS NULL ';
#$sql .= ' LIMIT '. $opt{L} if $opt{L};
my $sth = $dbi->prepare($sql);
$sth->execute or die $sth->errstr. " executing $sql";
@@ -111,19 +119,33 @@ sub dbi_import {
#print $row->{$pkey},"\n" if $opt{v};
my $error = $cdr->insert;
+
if ($error) {
+
#die $row->{$pkey} . ": failed import: $error\n";
print $row->{$pkey} . ": failed import: $error\n";
+
} else {
+
$imported++;
- my $updated = $dbi->do(
- "UPDATE $table SET freesidestatus = 'done' WHERE $pkey = ?",
- undef,
- $row->{$pkey}
- );
+ my $st_sql;
+ if ( $args{status_table} ) {
+
+ $st_sql =
+ 'INSERT INTO '. $args{status_table}. " ( $pkey, freesidestatus ) ".
+ " VALUES ( ?, 'done' )";
+
+ } else {
+
+ $st_sql = "UPDATE $table SET freesidestatus = 'done' WHERE $pkey = ?";
+
+ }
+
+ my $updated = $dbi->do($st_sql, undef, $row->{$pkey} );
#$updates += $updated;
die "failed to set status: ".$dbi->errstr."\n" unless $updated;
+
}
if ( $opt{L} && $imported >= $opt{L} ) {
diff --git a/bin/cdr-ivr.import b/bin/cdr-ivr.import
index 07c180b1e..9a4eb0d5e 100755
--- a/bin/cdr-ivr.import
+++ b/bin/cdr-ivr.import
@@ -5,11 +5,12 @@ use Date::Parse 'str2time';
use FS::cdr::Import;
FS::cdr::Import->dbi_import(
- 'dbd' => 'Sybase',
- 'database' => 'TEL_DATA',
- 'table' => 'BILLING',
- 'primary_key' => 'BILLING_ID',
- 'column_map' => { #freeside => IVR
+ 'dbd' => 'Sybase',
+ 'database' => 'TEL_DATA',
+ 'table' => 'BILLING',
+ 'primary_key' => 'BILLING_ID',
+ 'status_table' => 'FREESIDE_BILLING',
+ 'column_map' => { #freeside => IVR
'cdrid' => 'BILLING_ID', #Primary key
#'' => 'CALL_SESSION_ID', # Call Session Id (unique per call session â GUID)
'uniqueid' => 'CALL_ID', #
--
2.20.1