From 5538c56b686d8d09be74f98a3fbb774041ac196b Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Wed, 10 Apr 2019 11:20:59 +0200 Subject: [PATCH] TT#57201 ama export: option for fixed terminating number in 6001 records Change-Id: I58113faaee99db4d5c65dc83836cf70d52ef3426 --- lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm | 8 +++++--- .../BulkProcessor/Projects/Export/Ama/Ccs/Settings.pm | 5 +++++ .../BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg | 4 +++- .../Projects/Export/Ama/Ccs/settings.debug.cfg | 4 +++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm index d4e3f43f..e49c6c78 100644 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm @@ -30,6 +30,8 @@ use NGCP::BulkProcessor::Projects::Export::Ama::Ccs::Settings qw( $switch_number_pattern $switch_number_replacement + + $terminating_open_digits_6001 ); use NGCP::BulkProcessor::Logging qw ( @@ -441,7 +443,7 @@ sub _export_cdrs_init_context { start_time => $parent_cdrs->[0]->{start_time}, #? duration => abs($parent_cdrs->[0]->{start_time} - $parent_cdrs->[1]->{init_time}), originating => $originating, - terminating => $terminating, + terminating => ($terminating_open_digits_6001 ? $terminating_open_digits_6001 : $terminating), unanswered => 0, correlation_id => substr($parent_cdrs->[0]->{id},-7), nod => { @@ -487,7 +489,7 @@ sub _export_cdrs_init_context { start_time => $parent_cdrs->[0]->{start_time}, #? duration => $parent_cdrs->[0]->{duration}, originating => $originating, - terminating => $terminating, + terminating => ($terminating_open_digits_6001 ? $terminating_open_digits_6001 : $terminating), unanswered => 0, correlation_id => substr($parent_cdrs->[0]->{id},-7), nod => { @@ -535,7 +537,7 @@ sub _export_cdrs_init_context { start_time => $parent_cdrs->[1]->{start_time}, #? duration => abs($correlated_cdr->{start_time} - $parent_cdrs->[1]->{init_time}), originating => $originating, - terminating => $terminating, + terminating => ($terminating_open_digits_6001 ? $terminating_open_digits_6001 : $terminating), unanswered => 0, correlation_id => substr($parent_cdrs->[0]->{id},-7), nod => { diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/Settings.pm b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/Settings.pm index fce1ce82..3c664c87 100644 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/Settings.pm +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/Settings.pm @@ -66,6 +66,8 @@ our @EXPORT_OK = qw( $switch_number_pattern $switch_number_replacement + + $terminating_open_digits_6001 ); our $defaultconfig = 'config.cfg'; @@ -97,6 +99,7 @@ our $ivr_duration_limit = 5; our $primary_alias_pattern = undef; our $switch_number_pattern = undef; our $switch_number_replacement = undef; +our $terminating_open_digits_6001 = undef; sub update_settings { @@ -151,6 +154,8 @@ sub update_settings { $switch_number_replacement = $data->{switch_number_replacement} if exists $data->{switch_number_replacement}; + $terminating_open_digits_6001 = $data->{terminating_open_digits_6001} if exists $data->{terminating_open_digits_6001}; + return $result; } diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg index 464686ee..dbb3a4be 100644 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.cfg @@ -32,4 +32,6 @@ ivr_duration_limit = 5 primary_alias_pattern = 431976 switch_number_pattern = 43 -switch_number_replacement = \ No newline at end of file +switch_number_replacement = + +terminating_open_digits_6001 = 04319558290 \ No newline at end of file diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg index b6349cba..2248094c 100644 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg @@ -34,4 +34,6 @@ ivr_duration_limit = 5 #primary_alias_pattern = 431976 switch_number_pattern = 43 -switch_number_replacement = \ No newline at end of file +switch_number_replacement = + +terminating_open_digits_6001 = 04319558290 \ No newline at end of file