cosmetic coding for disa

This commit is contained in:
luis daniel lucio quiroz 2014-11-14 22:12:18 +00:00
parent 1e732b9467
commit 17b8c3ac69
1 changed files with 67 additions and 79 deletions

View File

@ -24,7 +24,7 @@
-- Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
--debug
debug["sql"] = true;
debug["sql"] = false;
--include config.lua
scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1));
@ -61,10 +61,9 @@ freeswitch.consoleLog("notice", "[disa] a_user_exists "..a_user_exists.."\n");
--Lets build correct dialstring
if (a_user_exists == "true") then
--
cmd = "user_data ".. aleg_number .."@"..context.." var extension_uuid";
extension_uuid = trim(api:executeString(cmd));
a_dialstring = "[direction=outbound,origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid.."]user/"..aleg_number.."@"..context;
a_dialstring = "[origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid.."]user/"..aleg_number.."@"..context;
else
sql = [[select * from v_dialplans as d, v_dialplan_details as s
where (d.domain_uuid = ']] .. domain_uuid .. [[' or d.domain_uuid is null)
@ -118,7 +117,7 @@ else
dialplan_detail_data = r.dialplan_detail_data:gsub("$1", destination_result);
--if the session is set then process the actions
if (y == 0) then
square = "[origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid..",";
square = "[direction=outbound,origination_caller_id_number="..bleg_number..",outbound_caller_id_number="..bleg_number..",call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid..",";
end
if (r.dialplan_detail_type == "set") then
if (dialplan_detail_data == "sip_h_X-accountcode=${accountcode}") then
@ -168,10 +167,6 @@ if session1:ready() and session1:answered() then
freeswitch.consoleLog("info", "[disa.callback] calling " .. bleg_number .. "\n");
t_started2 = os.date();
b_dialstring = "{context="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid.."}loopback/"..bleg_number.."/"..context;
cmd = "user_exists id ".. bleg_number .." "..context;
b_user_exists = trim(api:executeString(cmd));
@ -179,10 +174,9 @@ freeswitch.consoleLog("notice", "[disa] b_user_exists "..b_user_exists.."\n");
--Lets build correct dialstring
if (b_user_exists == "true") then
--
cmd = "user_data ".. bleg_number .."@"..context.." var extension_uuid";
extension_uuid = trim(api:executeString(cmd));
b_dialstring = "[direction=outbound,origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid.."]user/"..bleg_number.."@"..context;
b_dialstring = "[origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid.."]user/"..bleg_number.."@"..context;
else
sql = [[select * from v_dialplans as d, v_dialplan_details as s
where (d.domain_uuid = ']] .. domain_uuid .. [[' or d.domain_uuid is null)
@ -209,7 +203,6 @@ else
dialplans[x] = row;
x = x + 1;
end));
y = 0;
previous_dialplan_uuid = '';
for k, r in pairs(dialplans) do
@ -236,7 +229,7 @@ else
dialplan_detail_data = r.dialplan_detail_data:gsub("$1", destination_result);
--if the session is set then process the actions
if (y == 0) then
square = "[origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid..",";
square = "[direction=outbound,origination_caller_id_number="..aleg_number..",outbound_caller_id_number="..aleg_number..",call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid..",";
end
if (r.dialplan_detail_type == "set") then
if (dialplan_detail_data == "sip_h_X-accountcode=${accountcode}") then
@ -263,11 +256,6 @@ else
--end for
b_dialstring = dial_string;
end
freeswitch.consoleLog("info", "[disa.callback] b_dialstring " .. b_dialstring .. "\n");
session2 = freeswitch.Session(b_dialstring);