[freeside-commits] branch master updated. ca5b77df888ac14882c290f10f625654e39d9072
Christopher Burger
burgerc at freeside.biz
Wed Jan 24 11:47:49 PST 2018
The branch, master has been updated
via ca5b77df888ac14882c290f10f625654e39d9072 (commit)
from c7caf18eb75426b50715e3bf02c2a2f92e170b83 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ca5b77df888ac14882c290f10f625654e39d9072
Author: Christopher Burger <burgerc at freeside.biz>
Date: Wed Jan 24 14:45:43 2018 -0500
RT# 76398 - Fixed sybase connection and cleaned up code
diff --git a/FS/FS/cdr/Import.pm b/FS/FS/cdr/Import.pm
index c0c192f40..f2263c552 100644
--- a/FS/FS/cdr/Import.pm
+++ b/FS/FS/cdr/Import.pm
@@ -19,15 +19,19 @@ FS::cdr::Import - CDR importing
use FS::cdr::Import;
FS::cdr::Import->dbi_import(
- 'dbd' => 'Pg', #mysql, 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}; },
+ 'dbd' => 'Pg', #mysql, Sybase, etc.
+ 'database' => 'DATABASE_NAME',
+ 'table' => 'TABLE_NAME',,
+ 'status_table' => 'STATUS_TABLE_NAME', # if using a table rather than field in main table
+ 'primary_key' => 'BILLING_ID',
+ 'primary_key_info' => 'BIGINT', # defaults to bigint
+ 'status_column' => 'STATUS_COLUMN_NAME', # defaults to freesidestatus
+ 'status_column_info' => 'varchar(32)', # defaults to varchar(32)
+ '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.
+ 'batch_name' => 'batch_name', # cdr_batch name -import-date gets appended.
);
=head1 DESCRIPTION
@@ -59,6 +63,7 @@ sub dbi_import {
my $queries = get_queries({
'dbd' => $dbd_type,
+ 'host' => $opt{H},
'table' => $table,
'status_column' => $status_column,
'status_column_info' => $status_column_info,
@@ -67,8 +72,7 @@ sub dbi_import {
'primary_key_info' => $pkey_info,
});
- my $dsn = 'dbi:'. $dbd_type;
- $dsn .= $queries->{connect_type} . "=$opt{H}";
+ my $dsn = 'dbi:'. $dbd_type . $queries->{connect_type};
$dsn .= ";database=$database" if $database;
my $dbi = DBI->connect($dsn, $opt{U}, $opt{P})
@@ -178,44 +182,46 @@ sub dbi_import {
}
sub cli_usage {
- #"Usage: \n $0\n\t[ -H hostname ]\n\t-D database\n\t-U user\n\t-P password\n\tfreesideuser\n";
- #"Usage: \n $0\n\t-H hostname\n\t-D database\n\t-U user\n\t-P password\n\t[ -c cdrtypenum ]\n\tfreesideuser\n";
"Usage: \n $0\n\t-H hostname\n\t[ -D database ]\n\t-U user\n\t-P password\n\t[ -c cdrtypenum ]\n\t[ -L num_cdrs_limit ]\n\t[ -T table ]\n\t[ -S status table ]\n\tfreesideuser\n";
}
sub get_queries {
- #my ($dbd, $table, $column, $column_create_info, $status_table, $primary_key, $primary_key_info) = @_;
+ #my ($dbd, $host, $table, $column, $column_create_info, $status_table, $primary_key, $primary_key_info) = @_;
my $info = shift;
- #do we want to add more types? or add as we go?
+ #get host and port information.
+ my ($host, $port) = split /:/, $info->{host};
+ $host ||= 'localhost';
+ $port ||= '5000'; # check for pg default 5000 is sybase.
+
my %dbi_connect_types = (
- 'Sybase' => ':server',
- 'Pg' => ':host',
+ 'Sybase' => ':host='.$host.';port='.$port,
+ 'Pg' => ':host='.$info->{host},
);
- #Check for freeside status table Sybase has not been tested
+ #Check for freeside status table
my %dbi_check_statustable = (
- 'Sybase' => "SELECT * FROM sysobjects WHERE name = $info->{status_table}",
+ 'Sybase' => "SELECT * FROM sysobjects WHERE name = '$info->{status_table}'",
'Pg' => "SELECT * FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '$info->{status_table}' AND column_name = '$info->{status_column}'",
);
- #Check for freeside status table Sybase has not been tested
+ #Create freeside status table
my %dbi_create_statustable = (
'Sybase' => "CREATE TABLE $info->{status_table} ( $info->{primary_key} $info->{primary_key_info}, $info->{status_column} $info->{status_column_info} )",
'Pg' => "CREATE TABLE $info->{status_table} ( $info->{primary_key} $info->{primary_key_info}, $info->{status_column} $info->{status_column_info} )",
);
- #Check for freeside status column Sybase has not been tested
+ #Check for freeside status column
my %dbi_check_statuscolumn = (
'Sybase' => "SELECT syscolumns.name FROM sysobjects
JOIN syscolumns ON sysobjects.id = syscolumns.id
- WHERE sysobjects.name LIKE '$info->{table}' AND syscolumns.name = $info->{status_column}",
+ WHERE sysobjects.name LIKE '$info->{table}' AND syscolumns.name = '$info->{status_column}'",
'Pg' => "SELECT * FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '$info->{table}' AND column_name = '$info->{status_column}' ",
);
- #Check for freeside status column Sybase has not been tested
+ #Create freeside status column
my %dbi_create_statuscolumn = (
- 'Sybase' => "ALTER TABLE $info->{table} ADD $info->{status_column} $info->{status_column_info}",
+ 'Sybase' => "ALTER TABLE $info->{table} ADD $info->{status_column} $info->{status_column_info} NULL",
'Pg' => "ALTER TABLE $info->{table} ADD COLUMN $info->{status_column} $info->{status_column_info}",
);
@@ -232,7 +238,7 @@ sub get_queries {
=head1 BUGS
-This has only been test with Pg -> postgresql databases
+currently works with Pg(Postgresql) and Sybase(Sybase AES)
Sparse documentation.
diff --git a/FS/bin/freeside-cdr-freeswitch b/FS/bin/freeside-cdr-freeswitch
index 51f360ca7..3c18ef2a6 100644
--- a/FS/bin/freeside-cdr-freeswitch
+++ b/FS/bin/freeside-cdr-freeswitch
@@ -9,7 +9,7 @@ FS::cdr::Import->dbi_import(
'database' => 'fusionpbx',
'table' => 'v_xml_cdr',
'status_column' => 'freesidestatus',
- 'primary_key' => 'uuid',:q
+ 'primary_key' => 'uuid',
'column_map' => { #freeside => fusionpbx
#'cdrid' => 'uuid', #Primary key
#'' => 'CALL_SESSION_ID', # Call Session Id (unique per call session – GUID)
-----------------------------------------------------------------------
Summary of changes:
FS/FS/cdr/Import.pm | 54 +++++++++++++++++++++++-------------------
FS/bin/freeside-cdr-freeswitch | 2 +-
2 files changed, 31 insertions(+), 25 deletions(-)
More information about the freeside-commits
mailing list