TT#54807 .ama exporter: skip "null" destinations

- any non-numeric numbers will be sorted out as failed in general
- fix chown/chmod after renaming

Change-Id: Ib1409e16e803498b108df9b9f6e9f0959fb24c56
(cherry picked from commit e32ad4f534)
changes/57/27957/1
Rene Krenn 7 years ago
parent c5724239de
commit ee66bdf187

@ -303,12 +303,13 @@ sub _export_cdrs_init_context {
and ($scenario->{ccs_subscriber} = NGCP::BulkProcessor::Dao::Trunk::provisioning::voip_subscribers::findby_uuid(undef,$context->{cdrs}->[0]->{destination_user_id}))
and ($scenario->{ccs_subscriber}->{primary_alias} = NGCP::BulkProcessor::Dao::Trunk::provisioning::voip_dbaliases::findby_subscriberidisprimary($scenario->{ccs_subscriber}->{id},1)->[0])
) {
if (not $context->{cdrs}->[0]->{$ama_originating_digits_cdr_field}
or not $context->{cdrs}->[1]->{$ama_terminating_digits_cdr_field}) {
$malformed = 1;
} else {
if ($context->{cdrs}->[0]->{$ama_originating_digits_cdr_field} =~ /^[0-9]$/
and $context->{cdrs}->[1]->{$ama_terminating_digits_cdr_field} =~ /^[0-9]$/
) {
$scenario->{code} = $DIRECT_FORWARDER_SCENARIO;
$result = 1;
} else {
$malformed = 1;
}
#} else {
# print "blah";

@ -138,9 +138,9 @@ sub get_filesize {
sub _rename {
my $self = shift;
my ($filename) = @_;
$filename = rename($self->{tempfilename},$filename);
_chownmod($filename,$files_owner,$files_group,oct(666),$files_mask);
return $filename;
my $result = rename($self->{tempfilename},$filename);
_chownmod($filename,$files_owner,$files_group,oct(666),$files_mask) if $result;
return $result;
}
sub _makedir {

Loading…
Cancel
Save