Remove some trailing white spaces from the ring groups index.lua.

This commit is contained in:
Mark Crane 2013-09-09 23:57:10 +00:00
parent 57dabf6221
commit 9d4f07d885
1 changed files with 15 additions and 16 deletions

View File

@ -118,7 +118,7 @@
end)); end));
--freeswitch.consoleLog("NOTICE", "[ring_group] prompt "..prompt.."\n"); --freeswitch.consoleLog("NOTICE", "[ring_group] prompt "..prompt.."\n");
--freeswitch.consoleLog("NOTICE", "[ring_group] external "..external.."\n"); --freeswitch.consoleLog("NOTICE", "[ring_group] external "..external.."\n");
--get the dialplan data and save it to a table --get the dialplan data and save it to a table
if (external) then if (external) then
sql = [[select * from v_dialplans as d, v_dialplan_details as s sql = [[select * from v_dialplans as d, v_dialplan_details as s
@ -145,7 +145,7 @@
x = x + 1; x = x + 1;
end)); end));
end end
--process the destinations --process the destinations
x = 0; x = 0;
for key, row in pairs(destinations) do for key, row in pairs(destinations) do
@ -160,7 +160,7 @@
destination_delay = row.destination_delay; destination_delay = row.destination_delay;
destination_timeout = row.destination_timeout; destination_timeout = row.destination_timeout;
destination_prompt = row.destination_prompt; destination_prompt = row.destination_prompt;
--set ringback --set ringback
if (ring_group_ringback == "${uk-ring}") then if (ring_group_ringback == "${uk-ring}") then
ring_group_ringback = "tone_stream://%(400,200,400,450);%(400,2200,400,450);loops=-1"; ring_group_ringback = "tone_stream://%(400,200,400,450);%(400,2200,400,450);loops=-1";
@ -179,7 +179,7 @@
end end
session:setVariable("ringback", ring_group_ringback); session:setVariable("ringback", ring_group_ringback);
session:setVariable("transfer_ringback", ring_group_ringback); session:setVariable("transfer_ringback", ring_group_ringback);
--add the caller id prefix --add the caller id prefix
if (string.len(ring_group_cid_name_prefix) > 0) then if (string.len(ring_group_cid_name_prefix) > 0) then
origination_caller_id_name = ring_group_cid_name_prefix .. "#" .. caller_id_name; origination_caller_id_name = ring_group_cid_name_prefix .. "#" .. caller_id_name;
@ -187,7 +187,7 @@
origination_caller_id_name = caller_id_name; origination_caller_id_name = caller_id_name;
end end
origination_caller_id_number = caller_id_number; origination_caller_id_number = caller_id_number;
--setup the delimiter --setup the delimiter
delimiter = ","; delimiter = ",";
if (row.ring_group_strategy == "sequence") then if (row.ring_group_strategy == "sequence") then
@ -199,7 +199,7 @@
if (row.ring_group_strategy == "enterprise") then if (row.ring_group_strategy == "enterprise") then
delimiter = ":_:"; delimiter = ":_:";
end end
--create a new uuid and add it to the uuid list --create a new uuid and add it to the uuid list
new_uuid = api:executeString("create_uuid"); new_uuid = api:executeString("create_uuid");
if (string.len(uuids) == 0) then if (string.len(uuids) == 0) then
@ -208,7 +208,7 @@
uuids = uuids ..",".. new_uuid; uuids = uuids ..",".. new_uuid;
end end
session:execute("set", "uuids="..uuids); session:execute("set", "uuids="..uuids);
--process according to user_exists, sip_uri, external number --process according to user_exists, sip_uri, external number
if (user_exists == "true") then if (user_exists == "true") then
--send to user --send to user
@ -278,7 +278,7 @@
end end
--freeswitch.consoleLog("notice", "[ring group] dial_string: " .. dial_string .. "\n"); --freeswitch.consoleLog("notice", "[ring group] dial_string: " .. dial_string .. "\n");
end end
--prompt will use the confirm lua script and the content of else will use the concatenated dialstring seperated by the delimiter --prompt will use the confirm lua script and the content of else will use the concatenated dialstring seperated by the delimiter
if (prompt == "true") then if (prompt == "true") then
--determine confirm prompt --determine confirm prompt
@ -309,23 +309,23 @@
end end
--freeswitch.consoleLog("notice", "[ring group] app_data: " .. app_data .. "\n"); --freeswitch.consoleLog("notice", "[ring group] app_data: " .. app_data .. "\n");
end end
--increment the value of x --increment the value of x
x = x + 1; x = x + 1;
end end
--session execute --session execute
if (session:ready()) then if (session:ready()) then
--set the variables --set the variables
session:execute("set", "hangup_after_bridge=true"); session:execute("set", "hangup_after_bridge=true");
session:execute("set", "continue_on_fail=true"); session:execute("set", "continue_on_fail=true");
--set bind meta app --set bind meta app
session:execute("bind_meta_app", "1 ab s execute_extension::dx XML features"); session:execute("bind_meta_app", "1 ab s execute_extension::dx XML features");
session:execute("bind_meta_app", "2 ab s record_session::"..recordings_dir.."}/archive/"..os.date("%Y").."/"..os.date("%m").."/"..os.date("%d").."}/"..uuid..".wav"); session:execute("bind_meta_app", "2 ab s record_session::"..recordings_dir.."}/archive/"..os.date("%Y").."/"..os.date("%m").."/"..os.date("%d").."}/"..uuid..".wav");
session:execute("bind_meta_app", "3 ab s execute_extension::cf XML features"); session:execute("bind_meta_app", "3 ab s execute_extension::cf XML features");
session:execute("bind_meta_app", "4 ab s execute_extension::att_xfer XML features"); session:execute("bind_meta_app", "4 ab s execute_extension::att_xfer XML features");
--prompt to accept call if true schedule the call timeout --prompt to accept call if true schedule the call timeout
if (prompt == "true") then if (prompt == "true") then
--schedule the timeout and route to the timeout destination --schedule the timeout and route to the timeout destination
@ -338,21 +338,20 @@
end end
--freeswitch.consoleLog("NOTICE", "[confirm] schedule timeout: "..cmd.."\n"); --freeswitch.consoleLog("NOTICE", "[confirm] schedule timeout: "..cmd.."\n");
results = trim(api:executeString(cmd)); results = trim(api:executeString(cmd));
--start the uuid hangup monitor --start the uuid hangup monitor
api = freeswitch.API(); api = freeswitch.API();
cmd = "luarun "..scripts_dir.."/app/ring_groups/resources/scripts/monitor.lua "..uuid.." 30"; cmd = "luarun "..scripts_dir.."/app/ring_groups/resources/scripts/monitor.lua "..uuid.." 30";
result = api:executeString(cmd); result = api:executeString(cmd);
--answer the call this is required for uuid_broadcast --answer the call this is required for uuid_broadcast
session:answer(); session:answer();
--park the call and add the simulated ringback --park the call and add the simulated ringback
cmd = "bgapi uuid_park "..uuid; cmd = "bgapi uuid_park "..uuid;
result = api:executeString(cmd); result = api:executeString(cmd);
cmd = "bgapi uuid_broadcast "..uuid.." "..ring_group_ringback.." aleg"; cmd = "bgapi uuid_broadcast "..uuid.." "..ring_group_ringback.." aleg";
result = api:executeString(cmd); result = api:executeString(cmd);
else else
--no prompt --no prompt
if (app_data) then if (app_data) then