Update the method to connect to the database with lua.

includes/install/scripts/app/conference_center/index.lua

@@ -30,7 +30,8 @@
 	digit_timeout = 5000;
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --prepare the api object
 	api = freeswitch.API();
@@ -139,7 +140,8 @@
 			end_epoch = os.time();
 
 		--connect to the database
-			dbh = freeswitch.Dbh(database["system"]);
+			dofile(scripts_dir.."/resources/functions/database_handle.lua");
+			dbh = database_handle('system');
 
 		--get the conference sessions
 			if (conference_session_uuid) then

includes/install/scripts/app/voicemail/index.lua

@@ -49,7 +49,8 @@
 	password_tries = 0;
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --set the api
 	api = freeswitch.API();

includes/install/scripts/app/voicemail/resources/scripts/mwi.lua

@@ -36,7 +36,8 @@
 	debug["info"] = false;
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --used to stop the lua service
 	local file = assert(io.open(tmp_file, "w"));

includes/install/scripts/app/xml_handler/index.lua

@@ -42,7 +42,11 @@
 	dofile(scripts_dir.."/resources/functions/explode.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
+
+--exits the script if we didn't connect properly
+	assert(dbh:connected());
 
 --if the params class and methods do not exist then add them to prevent errors
 	if (not params) then

includes/install/scripts/call_flow.lua

@@ -33,7 +33,8 @@
 	dofile(scripts_dir.."/resources/config.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 if (session:ready()) then
 	--get the variables

includes/install/scripts/call_flow_monitor.lua

@@ -40,7 +40,8 @@
 	dofile(scripts_dir.."/resources/functions/mkdir.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --make sure the scripts/run dir exists
 	mkdir(scripts_dir .. "/run");

includes/install/scripts/destination_caller_id.lua

@@ -29,7 +29,8 @@
 	dofile(scripts_dir.."/resources/config.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --add a trim function
 	function trim (s)

includes/install/scripts/dial_string.lua

@@ -37,7 +37,8 @@
 	dofile(scripts_dir.."/resources/config.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 if ( session:ready() ) then
 	session:answer();

includes/install/scripts/directory.lua

@@ -42,7 +42,8 @@
 	dofile(scripts_dir.."/resources/config.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --prepare the api object
 	api = freeswitch.API();

includes/install/scripts/eavesdrop.lua

@@ -39,7 +39,8 @@ extension = argv[1];
 		--dbh = freeswitch.Dbh("core:core"); -- when using sqlite
 		dbh = freeswitch.Dbh("sqlite://"..database_dir.."/core.db");
 	else
-		dbh = freeswitch.Dbh(database["switch"]);
+		dofile(scripts_dir.."/resources/functions/database_handle.lua");
+		dbh = database_handle('switch');
 	end
 
 --exits the script if we didn't connect properly

includes/install/scripts/intercept.lua

@@ -39,7 +39,8 @@
 		--dbh = freeswitch.Dbh("core:core"); -- when using sqlite
 		dbh = freeswitch.Dbh("sqlite://"..database_dir.."/core.db");
 	else
-		dbh = freeswitch.Dbh(database["switch"]);
+		dofile(scripts_dir.."/resources/functions/database_handle.lua");
+		dbh = database_handle('switch');
 	end
 
 --exits the script if we didn't connect properly

includes/install/scripts/ivr_menu.lua

@@ -36,7 +36,8 @@
 	dofile(scripts_dir.."/resources/config.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --get the variables
 	domain_name = session:getVariable("domain_name");

includes/install/scripts/park.lua

@@ -21,7 +21,8 @@
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite
 	dbh = freeswitch.Dbh("sqlite://"..database_dir.."/park.db");
-	--dbh = freeswitch.Dbh(database["system"]);
+	--dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	--dbh = database_handle('system');
 
 --exits the script if we didn't connect properly
 	assert(dbh:connected());

includes/install/scripts/park_monitor.lua

@@ -35,7 +35,7 @@
 --connect to the database
 	--dbh = freeswitch.Dbh("core:core"); -- when using sqlite
 	dbh = freeswitch.Dbh("sqlite://"..database_dir.."/park.db");
-	--dbh = freeswitch.Dbh(database["system"]);
+	--dofile(scripts_dir.."/resources/functions/database_handle.lua");
 
 --get the argv values
 	script_name = argv[0];

includes/install/scripts/resources/functions/database_handle.lua

@@ -0,0 +1,9 @@
+
+--connect to the database
+	function database_handle(t)
+		if (t == "system") then
+			return freeswitch.Dbh(database["system"]);
+		elseif (t == "switch") then
+			return freeswitch.Dbh(database["switch"]);
+		end
+	end

includes/install/scripts/resources/functions/trim.lua

@@ -1,5 +1,7 @@
 
 --add the trim function
 	function trim(s)
-		return s:gsub("^%s+", ""):gsub("%s+$", "")
+		if (s) then
+			return s:gsub("^%s+", ""):gsub("%s+$", "")
+		end
 	end

includes/install/scripts/ring_group.lua

@@ -29,7 +29,8 @@
 	dofile(scripts_dir.."/resources/config.lua");
 
 --connect to the database
-	dbh = freeswitch.Dbh(database["system"]);
+	dofile(scripts_dir.."/resources/functions/database_handle.lua");
+	dbh = database_handle('system');
 
 --get the variables
 	if (session:ready()) then