sipwise
/
bulk-processor
mirror of https://github.com/sipwise/bulk-processor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#56502 TT#56501 ama exporter: align sw3number

Browse Source 
no_xfer: [cdr0]
currently cdr0->destination_user_in ok as is

bilnd_xfer: [cdr0, cdr0_xfer-1]
currently cdr0_xfer-1->destination_user_in, change to
cdr0->destination_user_in

attn_xfer_ivr: [cdr0, cdr0_pbx-1, cdr0, cdr0_xfer-1_groupcdr]
currently cdr0_pbx-1->destination_user_in, change to
cdr0_pbx-1->groupcdr->destination_user_in

Change-Id: If7099e344f303412958c902e91f2e7d5ae7bff35
changes/34/28534/1
Rene Krenn 7 years ago
parent ecec9bd771
commit 9e6210d193
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File

24
lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm
Unescape View File

@ -419,6 +419,7 @@ sub _export_cdrs_init_context {
if ($scenario->{code} == $BLIND_TRANSFER_NO_IVR) {
my $originating = $parent_cdrs->[0]->{$ama_originating_digits_cdr_field};
my $terminating = $parent_cdrs->[1]->{$ama_terminating_digits_cdr_field};
my $switch_number = $parent_cdrs->[0]->{$ama_terminating_digits_cdr_field};
push(@{$scenario->{ama}},{
start_time => $parent_cdrs->[1]->{start_time}, #?
duration => $parent_cdrs->[1]->{duration},
@ -428,13 +429,14 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '0001',
},
});
} elsif ($scenario->{code} == $BLIND_TRANSFER) {
my $originating = $parent_cdrs->[0]->{$ama_originating_digits_cdr_field};
my $terminating = $parent_cdrs->[1]->{$ama_terminating_digits_cdr_field};
my $switch_number = $parent_cdrs->[0]->{$ama_terminating_digits_cdr_field};
push(@{$scenario->{ama}},{
start_time => $parent_cdrs->[0]->{start_time}, #?
duration => abs($parent_cdrs->[0]->{start_time} - $parent_cdrs->[1]->{init_time}),
@ -444,7 +446,7 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '6001',
},
},{
@ -456,13 +458,14 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '2002',
},
});
} elsif ($scenario->{code} == $NO_TRANSFER_NO_IVR) {
my $originating = $parent_cdrs->[0]->{$ama_originating_digits_cdr_field};
my $terminating = $parent_cdrs->[0]->{$ama_terminating_digits_cdr_field};
my $switch_number = $terminating;
push(@{$scenario->{ama}},{
start_time => $parent_cdrs->[0]->{start_time}, #?
duration => 0,
@ -472,13 +475,14 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '0001',
},
});
} elsif ($scenario->{code} == $NO_TRANSFER) {
my $originating = $parent_cdrs->[0]->{$ama_originating_digits_cdr_field};
my $terminating = $parent_cdrs->[0]->{$ama_terminating_digits_cdr_field};
my $switch_number = $terminating;
push(@{$scenario->{ama}},{
start_time => $parent_cdrs->[0]->{start_time}, #?
duration => $parent_cdrs->[0]->{duration},
@ -488,7 +492,7 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '6001',
},
},{
@ -500,7 +504,7 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '2002',
},
});
@ -508,6 +512,7 @@ sub _export_cdrs_init_context {
my $correlated_cdr = $parent_cdrs->[1]->{_correlated_cdrs}->[0];
my $originating = $correlated_cdr->{$ama_originating_digits_cdr_field};
my $terminating = $parent_cdrs->[1]->{$ama_terminating_digits_cdr_field};
my $switch_number = $correlated_cdr->{$ama_terminating_digits_cdr_field};
push(@{$scenario->{ama}},{
start_time => $parent_cdrs->[1]->{start_time}, #?
duration => $correlated_cdr->{duration} - abs($correlated_cdr->{start_time} - $parent_cdrs->[1]->{start_time}),
@ -517,7 +522,7 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '0001',
},
});
@ -525,6 +530,7 @@ sub _export_cdrs_init_context {
my $correlated_cdr = $parent_cdrs->[1]->{_correlated_cdrs}->[0];
my $originating = $correlated_cdr->{$ama_originating_digits_cdr_field};
my $terminating = $parent_cdrs->[1]->{$ama_terminating_digits_cdr_field};
my $switch_number = $correlated_cdr->{$ama_terminating_digits_cdr_field};
push(@{$scenario->{ama}},{
start_time => $parent_cdrs->[1]->{start_time}, #?
duration => abs($correlated_cdr->{start_time} - $parent_cdrs->[1]->{init_time}),
@ -534,7 +540,7 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '6001',
},
},{
@ -546,7 +552,7 @@ sub _export_cdrs_init_context {
correlation_id => substr($parent_cdrs->[0]->{id},-7),
nod => {
originating_digits => $originating,
switch_number_digits => _rewrite_switch_number($terminating), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
switch_number_digits => _rewrite_switch_number($switch_number), #$scenario->{ccs_subscriber}->{primary_alias}->{username},
mode => '2002',
},
});

2
lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/settings.debug.cfg
Unescape View File

@ -12,7 +12,7 @@ export_cdr_rollover_fsn = 1
#, { 'accounting.cdr.rating_status' => { '=' => '"ok"' } }
#{ 'accounting.cdr.call_status' => { '=' => '"ok"' } }
#export_cdr_joins = { 'accounting.cdr_export_status_data esd' => { 'esd.cdr_id' => 'accounting.cdr.id' } }, { 'accounting.cdr_export_status es' => { 'es.id' => 'esd.status_id' } }
export_cdr_conditions = { 'accounting.cdr.id' => { '>=' => '51' } }
export_cdr_conditions = { 'accounting.cdr.id' => { 'IN' => '(51,53, 87,89, 55, 79, 65,67,69, 81,83,85)' } }
use_tempfiles = 1
make_dir = 1

Write Preview
Loading…
Cancel
Save