dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmetic coding for disa

Browse Source
This commit is contained in:
luis daniel lucio quiroz
2014-11-14 22:12:18 +00:00
parent 6a531ebfbc
commit ee0dd17a03
1 changed files with 67 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/disa.callback.lua
+67 -79
View File
@@ -24,7 +24,7 @@
-- Luis Daniel Lucio Quiroz <dlucio@okay.com.mx> -- Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
--debug --debug
debug["sql"] = true; debug["sql"] = false;
--include config.lua --include config.lua
scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1)); 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 --Lets build correct dialstring
if (a_user_exists == "true") then if (a_user_exists == "true") then
--
cmd = "user_data ".. aleg_number .."@"..context.." var extension_uuid"; cmd = "user_data ".. aleg_number .."@"..context.." var extension_uuid";
extension_uuid = trim(api:executeString(cmd)); 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 else
sql = [[select * from v_dialplans as d, v_dialplan_details as s sql = [[select * from v_dialplans as d, v_dialplan_details as s
where (d.domain_uuid = ']] .. domain_uuid .. [[' or d.domain_uuid is null) 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); dialplan_detail_data = r.dialplan_detail_data:gsub("$1", destination_result);
--if the session is set then process the actions --if the session is set then process the actions
if (y == 0) then 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 end
if (r.dialplan_detail_type == "set") then if (r.dialplan_detail_type == "set") then
if (dialplan_detail_data == "sip_h_X-accountcode=${accountcode}") then if (dialplan_detail_data == "sip_h_X-accountcode=${accountcode}") then
@@ -168,23 +167,18 @@ if session1:ready() and session1:answered() then
freeswitch.consoleLog("info", "[disa.callback] calling " .. bleg_number .. "\n"); freeswitch.consoleLog("info", "[disa.callback] calling " .. bleg_number .. "\n");
t_started2 = os.date(); 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));
freeswitch.consoleLog("notice", "[disa] b_user_exists "..b_user_exists.."\n");
--Lets build correct dialstring
if (b_user_exists == "true") then
cmd = "user_exists id ".. bleg_number .." "..context; cmd = "user_data ".. bleg_number .."@"..context.." var extension_uuid";
b_user_exists = trim(api:executeString(cmd)); extension_uuid = trim(api:executeString(cmd));
freeswitch.consoleLog("notice", "[disa] b_user_exists "..b_user_exists.."\n"); 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
--Lets build correct dialstring sql = [[select * from v_dialplans as d, v_dialplan_details as s
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;
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) where (d.domain_uuid = ']] .. domain_uuid .. [[' or d.domain_uuid is null)
and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3'
and d.dialplan_enabled = 'true' and d.dialplan_enabled = 'true'
@@ -200,74 +194,68 @@ else
WHEN 'anti-action' THEN 3 WHEN 'anti-action' THEN 3
ELSE 100 END, ELSE 100 END,
s.dialplan_detail_order asc ]] s.dialplan_detail_order asc ]]
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[disa ] sql for dialplans:" .. sql .. "\n"); freeswitch.consoleLog("notice", "[disa ] sql for dialplans:" .. sql .. "\n");
end
dialplans = {};
x = 1;
assert(dbh:query(sql, function(row)
dialplans[x] = row;
x = x + 1;
end));
y = 0;
previous_dialplan_uuid = '';
for k, r in pairs(dialplans) do
if (y > 0) then
if (previous_dialplan_uuid ~= r.dialplan_uuid) then
regex_match = false;
bridge_match = false;
square = square .. "]";
y = 0;
end
end end
if (r.dialplan_detail_tag == "condition") then dialplans = {};
if (r.dialplan_detail_type == "destination_number") then x = 1;
if (api:execute("regex", "m:~"..bleg_number.."~"..r.dialplan_detail_data) == "true") then assert(dbh:query(sql, function(row)
--get the regex result dialplans[x] = row;
destination_result = trim(api:execute("regex", "m:~"..bleg_number.."~"..r.dialplan_detail_data.."~$1")); x = x + 1;
regex_match = true end));
y = 0;
previous_dialplan_uuid = '';
for k, r in pairs(dialplans) do
if (y > 0) then
if (previous_dialplan_uuid ~= r.dialplan_uuid) then
regex_match = false;
bridge_match = false;
square = square .. "]";
y = 0;
end end
end end
end if (r.dialplan_detail_tag == "condition") then
if (r.dialplan_detail_tag == "action") then if (r.dialplan_detail_type == "destination_number") then
if (regex_match) then if (api:execute("regex", "m:~"..bleg_number.."~"..r.dialplan_detail_data) == "true") then
--replace $1 --get the regex result
dialplan_detail_data = r.dialplan_detail_data:gsub("$1", destination_result); destination_result = trim(api:execute("regex", "m:~"..bleg_number.."~"..r.dialplan_detail_data.."~$1"));
--if the session is set then process the actions regex_match = true
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..",";
end
if (r.dialplan_detail_type == "set") then
if (dialplan_detail_data == "sip_h_X-accountcode=${accountcode}") then
square = square .. "sip_h_X-accountcode="..accountcode..",";
elseif (dialplan_detail_data == "effective_caller_id_name=${outbound_caller_id_name}") then
elseif (dialplan_detail_data == "effective_caller_id_number=${outbound_caller_id_number}") then
else
square = square .. dialplan_detail_data..",";
end end
elseif (r.dialplan_detail_type == "bridge") then
if (bridge_match) then
dial_string = dial_string .. "," .. square .."]"..dialplan_detail_data;
square = "[";
else
dial_string = square .."]"..dialplan_detail_data;
end
bridge_match = true;
end end
y = y + 1;
end end
if (r.dialplan_detail_tag == "action") then
if (regex_match) then
--replace $1
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 = "[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
square = square .. "sip_h_X-accountcode="..accountcode..",";
elseif (dialplan_detail_data == "effective_caller_id_name=${outbound_caller_id_name}") then
elseif (dialplan_detail_data == "effective_caller_id_number=${outbound_caller_id_number}") then
else
square = square .. dialplan_detail_data..",";
end
elseif (r.dialplan_detail_type == "bridge") then
if (bridge_match) then
dial_string = dial_string .. "," .. square .."]"..dialplan_detail_data;
square = "[";
else
dial_string = square .."]"..dialplan_detail_data;
end
bridge_match = true;
end
y = y + 1;
end
end
previous_dialplan_uuid = r.dialplan_uuid;
end end
previous_dialplan_uuid = r.dialplan_uuid; --end for
b_dialstring = dial_string;
end end
--end for
b_dialstring = dial_string;
end
freeswitch.consoleLog("info", "[disa.callback] b_dialstring " .. b_dialstring .. "\n"); freeswitch.consoleLog("info", "[disa.callback] b_dialstring " .. b_dialstring .. "\n");
session2 = freeswitch.Session(b_dialstring); session2 = freeswitch.Session(b_dialstring);