$conf = new FS::Conf;
-die "not running; cdr-asterisk_forward_rewrite conf is off\n"
+die "not running; cdr-asterisk_forward_rewrite, cdr-charged_party_rewrite ".
+ " and cdr-taqua-accountcode_rewrite conf options are all off\n"
unless _shouldrun();
#--
-my $domestic_prefix = 1; #hmm, global config?
-
while (1) {
#hmm... don't want to do an expensive search with an ever-growing bunch
) {
$found = 1;
+ my @status = ();
- if ( $cdr->dstchannel =~ /^Local\/($domestic_prefix)?(\d+)/i
- && $2 ne $cdr->dst
+ if ( $conf->exists('cdr-asterisk_forward_rewrite')
+ && $cdr->dstchannel =~ /^Local\/(\d+)/i && $1 ne $cdr->dst
)
{
- my $dst = $2;
+ my $dst = $1;
warn "dst ". $cdr->dst. " does not match dstchannel $dst ".
"(". $cdr->dstchannel. "); rewriting CDR as a forwarded call";
$cdr->dst($dst);
$cdr->amaflags(2);
- $cdr->freesiderewritestatus('asterisk_forward');
+ push @status, 'asterisk_forward';
+
+ }
+
+ if ( $conf->exists('cdr-charged_party_rewrite') && ! $cdr->charged_party ) {
+
+ $cdr->set_charged_party;
+ push @status, 'charged_party';
- } else {
- $cdr->freesiderewritestatus('skipped')
}
+ if ( $conf->exists('cdr-taqua-accountcode_rewrite')
+ && $cdr->lastapp eq 'acctcode' && $cdr->cdrtypenum == 1
+ )
+ {
+
+ #find the matching CDR
+ my $primary = qsearchs('cdr', {
+ 'sessionnum' => $cdr->sessionnum,
+ 'src' => $cdr->subscriber,
+ #'accountcode' => '',
+ });
+
+ unless ( $primary ) {
+ warn "WARNING: can't find primary CDR with session ". $cdr->sessionnum.
+ ", src ". $cdr->subscriber. "; will keep trying\n";
+ next;
+ }
+
+ $primary->accountcode( $cdr->lastdata );
+ #$primary->freesiderewritestatus( 'taqua-accountcode-primary' );
+ my $error = $primary->replace;
+ if ( $error ) {
+ warn "WARNING: error rewriting primary CDR (will retry): $error\n";
+ next;
+ }
+
+ push @status, 'taqua-accountcode';
+ }
+
+ $cdr->freesiderewritestatus(
+ scalar(@status) ? join('/', @status) : 'skipped'
+ );
+
my $error = $cdr->replace;
if ( $error ) {
#--
sub _shouldrun {
- $conf->exists('cdr-asterisk_forward_rewrite');
+ $conf->exists('cdr-asterisk_forward_rewrite')
+ || $conf->exists('cdr-charged_party_rewrite')
+ || $conf->exists('cdr-taqua-accountcode_rewrite');
}
sub usage {
=head1 DESCRIPTION
-Runs continuously, searches for CDRs and does forwarded-call rewriting if
-the "cdr-asterisk_forward_rewrite" option is enabled.
+Runs continuously, searches for CDRs and does forwarded-call rewriting if the
+"cdr-asterisk_forward_rewrite" or "cdr-charged_party_rewrite" config option is
+enabled.
=head1 SEE ALSO