sub get_cdrs_for_update {
my($self, %options) = @_;
+ my @cdrs = $self->get_cdrs_fromfield('charged_party', %options);
+
+ push @cdrs, $self->get_cdrs_fromfield('src', %options)
+ unless $options{'disable_src'};
+
+ @cdrs;
+}
+
+sub get_cdrs_fromfield {
+ my($self, $field, %options) = @_;
+
my $default_prefix = $options{'default_prefix'};
#CDRs are now associated with svc_phone services via svc_phone.phonenum
qsearch( {
'table' => 'cdr',
'hashref' => { 'freesidestatus' => '',
- 'charged_party' => $number
+ $field => $number
},
'extra_sql' => 'FOR UPDATE',
} );
qsearch( {
'table' => 'cdr',
'hashref' => { 'freesidestatus' => '',
- 'charged_party' => "$default_prefix$number",
+ $field => "$default_prefix$number",
},
'extra_sql' => 'FOR UPDATE',
} );
}
- #astricon hack? config option?
- push @cdrs,
- qsearch( {
- 'table' => 'cdr',
- 'hashref' => { 'freesidestatus' => '',
- 'src' => $number,
- },
- 'extra_sql' => 'FOR UPDATE',
- } );
-
- if ( length($default_prefix) ) {
- push @cdrs,
- qsearch( {
- 'table' => 'cdr',
- 'hashref' => { 'freesidestatus' => '',
- 'src' => "$default_prefix$number",
- },
- 'extra_sql' => 'FOR UPDATE',
- } );
- }
-
@cdrs;
}
'default' => '+1',
},
+ 'disable_src' => { 'name' => 'Disable rating of CDR records based on the "src" field in addition to "charged_party"',
+ 'type' => 'checkbox'
+ },
+
+ 'domestic_prefix' => { 'name' => 'Destination prefix for domestic CDR records',
+ 'default' => '1',
+ },
+
+# 'domestic_prefix_required' => { 'name' => 'Require explicit destination prefix for domestic CDR records',
+# 'type' => 'checkbox',
+# },
+
+ 'international_prefix' => { 'name' => 'Destination prefix for international CDR records',
+ 'default' => '011',
+ },
+
#XXX also have option for an external db??
# 'cdr_location' => { 'name' => 'CDR database location'
# 'type' => 'select',
# $dest =~ s/^(\w+):// and $proto = $1; #sip:
# my $siphost = '';
# $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
+
+ my $intl = $self->option('international_prefix') || '011';
#determine the country code
my $countrycode;
- if ( $number =~ /^011(((\d)(\d))(\d))(\d+)$/
+ if ( $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/
|| $number =~ /^\+(((\d)(\d))(\d))(\d+)$/
)
{
}
} else {
- $countrycode = '1';
- $number =~ s/^1//;# if length($number) > 10;
+ $countrycode = $self->option('domestic_prefix') || '1';
+ $number =~ s/^$countrycode//;# if length($number) > 10;
}
warn "rating call $to_or_from +$countrycode $number\n" if $DEBUG;