From b28667c45b9571548d059de53962dc5c597d643b Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Fri, 5 May 2017 12:56:12 -0400 Subject: [PATCH] RT# 74523 Added fusionpbx import script, updated Import.pm to handle different import scripts. updated ivr_import to use new Import.pm --- FS/FS/cdr/Import.pm | 15 ++++++++-- bin/cdr-fusionpbx.import | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ bin/cdr-ivr.import | 1 + 3 files changed, 87 insertions(+), 3 deletions(-) create mode 100755 bin/cdr-fusionpbx.import diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm index 39a7772a3..5046caf6f 100644 --- a/FS/FS/cdr/Import.pm +++ b/FS/FS/cdr/Import.pm @@ -22,10 +22,12 @@ FS::cdr::Import - CDR importing 'dbd' => 'mysql', #Pg, Sybase, etc. 'table' => 'TABLE_NAME', 'primary_key' => 'BILLING_ID', + 'status_table' = > 'STATUS_TABLE_NAME', # if using a table rather than field in main table 'column_map' => { #freeside => remote_db 'freeside_column' => 'remote_db_column', 'freeside_column' => sub { my $row = shift; $row->{remote_db_column}; }, }, + 'batch_name' => 'batch_name', # cdr_batch name -import-date gets appended. ); =head1 DESCRIPTION @@ -48,9 +50,16 @@ sub dbi_import { $opt{D} ||= $args{database}; + #do we want to add more types? or add as we go? + my %dbi_connect_types = { + 'Sybase' => ':server', + 'Pg' => ':host', + }; + my $dsn = 'dbi:'. $args{dbd}; - #$dsn .= ":host=$opt{H}"; #if $opt{H}; - $dsn .= ":server=$opt{H}"; #if $opt{H}; + + my $dbi_connect_type = $dbi_connect_types{$args{'dbd'}} ? $dbi_connect_types{$args{'dbd'}} : ':host'; + $dsn .= $dbi_connect_type . "=$opt{H}"; $dsn .= ";database=$opt{D}" if $opt{D}; my $dbi = DBI->connect($dsn, $opt{U}, $opt{P}) @@ -93,7 +102,7 @@ sub dbi_import { #MySQL-specific print "Importing ".$sth->rows." records...\n"; my $cdr_batch = new FS::cdr_batch({ - 'cdrbatch' => 'IVR-import-'. time2str('%Y/%m/%d-%T',time), + 'cdrbatch' => $args{batch_name} . '-import-'. time2str('%Y/%m/%d-%T',time), }); my $error = $cdr_batch->insert; die $error if $error; diff --git a/bin/cdr-fusionpbx.import b/bin/cdr-fusionpbx.import new file mode 100755 index 000000000..7bac6994e --- /dev/null +++ b/bin/cdr-fusionpbx.import @@ -0,0 +1,74 @@ +#!/usr/bin/perl + +use strict; +use Date::Parse 'str2time'; +use FS::cdr::Import; + +FS::cdr::Import->dbi_import( + 'dbd' => 'Pg', + 'database' => 'fusionpbx', + 'table' => 'v_xml_cdr', + 'primary_key' => 'uuid', + 'status_table' => 'freeside_billing', + 'column_map' => { #freeside => fusionpbx + #'cdrid' => 'uuid', #Primary key + #'' => 'CALL_SESSION_ID', # Call Session Id (unique per call session – GUID) + 'uniqueid' => 'uuid', # + #'' => 'ENTRY_TYPE', # + 'accountcode' => 'accountcode', # + #'' => 'ACCOUNT', # + #'' => 'ACCOUNT_GROUP', # + 'startdate' => sub { str2time(shift->{'start_stamp'}); }, + 'answerdate' => sub { str2time(shift->{'answer_stamp'}); }, + 'enddate' => sub { str2time(shift->{'end_stamp'}); }, + #'' => 'PARENT_ACCOUNT_ID', # + #'' => 'PARENT_ACCOUNT', # + #'' => 'LOGIN_NAME', # + #varchars not ints 'upstream_rateid' => 'RATE_SCHEDULE', # + #varchars not ints 'upstream_rateplanid' => 'RATE_PLAN', # + 'channel' => 'NODE', # + #'' => 'NODE_TYPE', # + #'' => 'ORIGIN', # + #'dst' => sub { $_[0]->{COUNTRY_CODE}. $_[0]->{NPA}. + # $_[0]->{NXX}. $_[0]->{LOCAL_NUMBER}; + # }, + #'description' => 'DESCRIPTION', # or upstream_dst_regionname ? + #'' => 'PER_CALL_CHARGE', # + #'' => 'PER_MINUTE_CHARGE', # + #'' => 'PER_CALL_SURCHARGE', # + #'' => 'PER_MINUTE_SURCHARGE', # + 'duration' => 'duration', # + 'billsec' => sub { int( shift->{'billsec'} * 60 + .49 ); }, # + #'upstream_price' => 'AMOUNT', # + #'' => 'PACKAGED_BALANCE_INDEX', # + #'upstream_currency' => 'CURRENCY', # + #'' => 'CONVERSION_RATE', # + 'lastapp' => 'last_app', # + #'src' => 'ANI', # 'clid' => 'ANI', # + 'dst' => sub { $_[0]->{'COUNTRY_CODE'} !~ /^1/ + ? "011". $_[0]->{'DETAIL'} + : $_[0]->{'DETAIL'}; + }, + #'' => 'SALES_GROUP', # + #'' => 'TAX_GROUP', # + #'userfield' => 'USER_1', # + #'' => 'USER_2', # + #'' => 'USER_3', # + #'' => 'USER_4', # + #'' => 'USER_5', # + #'' => 'USER_6', # + #'' => 'USER_7', # + #'' => 'USER_8', # + #'' => 'USER_9', # + #'' => 'USER_10', # + #'' => 'INFO_DIGITS', # VARCHAR(3) Info digits from the inbound leg, if applicable + #'' => 'RATE_INTERVAL', # TINYINT Rate interval used to bill the call (default: 60 seconds) ... create a new "upstream_granularity" field if we need this + #'' => 'DISCONNECT_CHARGE', # DECIMAL(15,4) The disconnect charge billed for the call + #'' => 'BILLING_DELAY', # SMALLINT Billing delay associated with the call + #'' => 'GRACE_PERIOD', # SMALLINT Grace period associated with the call + #'' => 'ACCOUNT_TYPE', # Account type from ACCOUNT_TYPES table + }, + 'batch_name' => 'fusionpbx', +); + +1; \ No newline at end of file diff --git a/bin/cdr-ivr.import b/bin/cdr-ivr.import index 9285b3b3b..212482de9 100755 --- a/bin/cdr-ivr.import +++ b/bin/cdr-ivr.import @@ -68,6 +68,7 @@ FS::cdr::Import->dbi_import( #'' => 'GRACE_PERIOD', # SMALLINT Grace period associated with the call #'' => 'ACCOUNT_TYPE', # Account type from ACCOUNT_TYPES table }, + 'batch_name' => 'IVR', ); 1; -- 2.11.0