read dialplan configuration from database

2 files changed, 15 insertions, 17 deletions

diff --git a/misc/freeswitch/scripts/dialplan/dialplan.lua b/misc/freeswitch/scripts/dialplan/dialplan.lua
index 69cccf1..0f3f59f 100644
--- a/misc/freeswitch/scripts/dialplan/dialplan.lua
+++ b/misc/freeswitch/scripts/dialplan/dialplan.lua
@@ -74,22 +74,22 @@ function Dialplan.domain_get(self, domain)
 end
 
 
-function Dialplan.configuration_read(self, file_name)
+function Dialplan.configuration_read(self)
   require 'common.str'
-  require 'common.configuration_file'
+  require 'common.configuration_table'
 
   -- dialplan configuration
-  self.config  = common.configuration_file.get(file_name or CONFIG_FILE_NAME);
+  self.config  = common.configuration_table.get(self.database, 'dialplan');
   self.node_id = common.str.to_i(self.config.parameters.node_id);
   self.domain =  self:domain_get(self.config.parameters.domain);
   self.dial_timeout = tonumber(self.config.parameters.dial_timeout) or DIAL_TIMEOUT;
   self.max_loops = tonumber(self.config.parameters.max_loops) or MAX_LOOPS;
   self.user_image_url = common.str.to_s(self.config.parameters.user_image_url);
   self.phone_book_entry_image_url = common.str.to_s(self.config.parameters.phone_book_entry_image_url);
-  self.phonebook_number_lookup = common.str.to_b(self.config.parameters.phonebook_number_lookup);
-  self.geo_number_lookup = common.str.to_b(self.config.parameters.geo_number_lookup);
+  self.phonebook_number_lookup = self.config.parameters.phonebook_number_lookup;
+  self.geo_number_lookup = self.config.parameters.geo_number_lookup;
   self.default_language = self.config.parameters.default_language or 'en';
-  self.send_ringing_to_gateways = common.str.to_b(self.config.parameters.send_ringing_to_gateways);
+  self.send_ringing_to_gateways = self.config.parameters.send_ringing_to_gateways;
   
   if tonumber(self.config.parameters.default_ringtone) then
     self.default_ringtone = 'http://amooma.de;info=Ringer' .. self.config.parameters.default_ringtone .. ';x-line-id=0';
diff --git a/misc/freeswitch/scripts/dialplan_default.lua b/misc/freeswitch/scripts/dialplan_default.lua
index ee4a88f..91ad4e4 100644
--- a/misc/freeswitch/scripts/dialplan_default.lua
+++ b/misc/freeswitch/scripts/dialplan_default.lua
@@ -23,10 +23,18 @@ log = common.log.Log:new{ prefix = '### [' .. session:get_uuid() .. '] ' };
 require 'dialplan.session'
 start_caller = dialplan.session.Session:new{ log = log, session = session };
 
+-- connect to database
+require 'common.database'
+local database = common.database.Database:new{ log = log }:connect();
+if not database:connected() then
+  log:critical('DIALPLAN_DEFAULT - database connect failed');
+  return;
+end
+
 -- dialplan object
 require 'dialplan.dialplan'
 
-start_dialplan = dialplan.dialplan.Dialplan:new{ log = log, caller = start_caller };
+start_dialplan = dialplan.dialplan.Dialplan:new{ log = log, caller = start_caller, database = database };
 start_dialplan:configuration_read();
 start_caller.local_node_id = start_dialplan.node_id;
 start_caller:init_channel_variables();
@@ -39,16 +47,6 @@ if not start_dialplan:check_auth() then
   return false;
 end
 
--- connect to database
-require 'common.database'
-local database = common.database.Database:new{ log = log }:connect();
-if not database:connected() then
-  log:critical('DIALPLAN_DEFAULT - database connect failed');
-  return;
-end
-
-start_dialplan.database = database;
-
 if start_caller.from_node and not start_dialplan:check_auth_node() then
   log:debug('AUTHENTICATION_REQUIRED_NODE - node_id: ', start_caller.node_id, ', domain: ', start_dialplan.domain);
   start_dialplan:hangup(407, start_dialplan.domain);