summaryrefslogtreecommitdiff
path: root/FS/FS/cdr
diff options
context:
space:
mode:
authorMitch Jackson <mitch@freeside.biz>2018-02-02 03:47:41 -0600
committerMitch Jackson <mitch@freeside.biz>2018-02-02 03:47:41 -0600
commitcbb6450c25690e5b3fccc6cfddd497de45f062d5 (patch)
tree05251805b9943693e35287ddef746d36a0ef4920 /FS/FS/cdr
parent42b6338522f6dc66771f49b38191b4201462fd82 (diff)
RT# 78952 CDR Import for Acme Packet Improved caller-id parsing
Diffstat (limited to 'FS/FS/cdr')
-rw-r--r--FS/FS/cdr/acmepacket.pm19
1 files changed, 15 insertions, 4 deletions
diff --git a/FS/FS/cdr/acmepacket.pm b/FS/FS/cdr/acmepacket.pm
index e0e80cd..1f00e40 100644
--- a/FS/FS/cdr/acmepacket.pm
+++ b/FS/FS/cdr/acmepacket.pm
@@ -130,17 +130,28 @@ our %info = (
# clid, dst, src CDR field formatted as one of the following:
# 'WIRELESS CALLER'<sip:12513001300@4.2.2.2:5060;user=phone>;tag=SDepng302
# <sip:12513001300@4.2.2.2:5060;user=phone>;tag=SDepng302
+ # '12513001300'<sip:4.2.2.2:5060;user=phone>;tag=SDepng302
# clid
$out[0] = $out[0] =~ /^\'(.+)\'/ ? $1 : "";
# src, dst
- # All of the sample data given shows sip connections. In case the same
- # switch is hooked into another circuit type in the future, we'll just
- # tease out a length 7+ number not contained in the caller-id-text field
+ # Use the 7+ digit number as the src/dst phone number.
+ # Prefer using the number within <sip> label. If there is not one,
+ # allow using number from caller-id text field.
for (1,2) {
+ my $f = $out[$_];
$out[$_] =~ s/^\'.+\'//g; # strip caller id label portion
- $out[$_] = $out[$_] =~ /(\d{7,})/ ? $1 : undef;
+ if ($out[$_] =~ /(\d{7,})/) {
+ # Using number from <sip>
+ $out[$_] = $1;
+ } elsif ($f =~ /(\d{7,})/) {
+ # Using number from caller-id text
+ $out[$_] = $1;
+ } else {
+ # No phone number, perhaps an IP only call
+ $out[$_] = undef;
+ }
}
if ($DEBUG) {