From 9b6ac876f60c5e5ee2a8789fc7cf01898ec71e3e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 11 Jan 2018 15:31:07 -0700 Subject: [PATCH] Update languages.lua --- .../resources/scripts/languages/languages.lua | 296 ++++++++---------- 1 file changed, 139 insertions(+), 157 deletions(-) diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua b/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua index e5a009021b..69bae958cc 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua @@ -1,6 +1,6 @@ -- xml_handler.lua -- Part of FusionPBX --- Copyright (C) 2013 Mark J Crane +-- Copyright (C) 2013-2018 Mark J Crane -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -13,7 +13,7 @@ -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- --- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +-- THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, @@ -33,181 +33,163 @@ --set the default continue = true; +--additional information + --event_calling_function = params:getHeader("Event-Calling-Function"); + +--show the params in the console + --if (params:serialize() ~= nil) then + -- freeswitch.consoleLog("notice", "[xml_handler-languages.lua] Params:\n" .. params:serialize() .. "\n"); + --end + --get the action --action = params:getHeader("action"); language = params:getHeader("lang"); macro_name = params:getHeader("macro_name"); ---additional information - --event_calling_function = params:getHeader("Event-Calling-Function"); +--get the cache + local cache = require "resources.functions.cache" + local language_cache_key = "languages:" .. language..":" .. macro_name; + XML_STRING, err = cache.get(language_cache_key) ---determine the correction action to perform - --get the cache - if (trim(api:execute("module_exists", "mod_memcache")) == "true") then - XML_STRING = trim(api:execute("memcache", "get languages:" .. language..":" .. macro_name)); - --freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. XML_STRING .. "\n"); - if (XML_STRING == "-ERR NOT FOUND") or (XML_STRING == "-ERR CONNECTION FAILURE") then - source = "database"; - continue = true; - else - source = "cache"; - continue = true; +--build the XML string from the database + if not XML_STRING then + + --connect to the database + local Database = require "resources.functions.database"; + dbh = Database.new('system'); + + --include json library + local json + if (debug["sql"]) then + json = require "resources.functions.lunajson" end - else - XML_STRING = ""; - source = "database"; - continue = true; - end - --show the params in the console - --if (params:serialize() ~= nil) then - -- freeswitch.consoleLog("notice", "[xml_handler-languages.lua] Params:\n" .. params:serialize() .. "\n"); - --end + --exits the script if we didn't connect properly + assert(dbh:connected()); - --build the XML string from the database - if (source == "database") then - - --connect to the database - local Database = require "resources.functions.database"; - dbh = Database.new('system'); - - --include json library - local json - if (debug["sql"]) then - json = require "resources.functions.lunajson" - end - - --exits the script if we didn't connect properly - assert(dbh:connected()); - - --get the domain_uuid - if (continue) then - if (domain_uuid == nil) then - --get the domain_uuid - if (domain_name ~= nil) then - local sql = "SELECT domain_uuid FROM v_domains "; - sql = sql .. "WHERE domain_name = :domain_name "; - local params = {domain_name = domain_name}; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); - end - dbh:query(sql, params, function(rows) - domain_uuid = rows["domain_uuid"]; - end); - end - end - end - - --prevent processing for invalid domains + --get the domain_uuid + if (continue) then if (domain_uuid == nil) then - continue = false; + --get the domain_uuid + if (domain_name ~= nil) then + local sql = "SELECT domain_uuid FROM v_domains "; + sql = sql .. "WHERE domain_name = :domain_name "; + local params = {domain_name = domain_name}; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n"); + end + dbh:query(sql, params, function(rows) + domain_uuid = rows["domain_uuid"]; + end); + end end + end - --set the xml array and then concatenate the array to a string - if (continue) then + --prevent processing for invalid domains + if (domain_uuid == nil) then + continue = false; + end - -- if macro_name is a uuid get from the phrase details - if (is_uuid(macro_name)) then - --define the xml table - local xml = {} + --set the xml array and then concatenate the array to a string + if (continue) then - --get hte xml - table.insert(xml, [[]]); - table.insert(xml, [[]]); - table.insert(xml, [[
]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); + -- if macro_name is a uuid get from the phrase details + if (is_uuid(macro_name)) then + --define the xml table + local xml = {} - local sql = "SELECT * FROM v_phrases as p, v_phrase_details as d "; - sql = sql .. "WHERE d.domain_uuid = :domain_uuid "; - sql = sql .. "AND p.phrase_uuid = :macro_name "; - sql = sql .. "AND p.phrase_language = :language "; - sql = sql .. "AND p.phrase_uuid = d.phrase_uuid "; - sql = sql .. "AND p.phrase_enabled = 'true' "; - sql = sql .. "ORDER BY d.domain_uuid, p.phrase_uuid, d.phrase_detail_order ASC "; - local params = {domain_uuid = domain_uuid, macro_name = macro_name, language = language}; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n"); - end - previous_phrase_uuid = ""; - match_tag = "open"; - x = 0; - dbh:query(sql, params, function(row) - --phrase_uuid,domain_uuid,phrase_name,phrase_language - --phrase_description,phrase_enabled,phrase_detail_uuid - --phrase_detail_group,phrase_detail_tag,phrase_detail_pattern - --phrase_detail_function,phrase_detail_data,phrase_detail_method - --phrase_detail_type,phrase_detail_order - if (previous_phrase_uuid ~= row.phrase_uuid) then - if (x > 0) then - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - end - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - match_open_tag = true + --get hte xml + table.insert(xml, [[]]); + table.insert(xml, [[]]); + table.insert(xml, [[
]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + + local sql = "SELECT * FROM v_phrases as p, v_phrase_details as d "; + sql = sql .. "WHERE d.domain_uuid = :domain_uuid "; + sql = sql .. "AND p.phrase_uuid = :macro_name "; + sql = sql .. "AND p.phrase_language = :language "; + sql = sql .. "AND p.phrase_uuid = d.phrase_uuid "; + sql = sql .. "AND p.phrase_enabled = 'true' "; + sql = sql .. "ORDER BY d.domain_uuid, p.phrase_uuid, d.phrase_detail_order ASC "; + local params = {domain_uuid = domain_uuid, macro_name = macro_name, language = language}; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n"); + end + previous_phrase_uuid = ""; + match_tag = "open"; + x = 0; + dbh:query(sql, params, function(row) + --phrase_uuid,domain_uuid,phrase_name,phrase_language + --phrase_description,phrase_enabled,phrase_detail_uuid + --phrase_detail_group,phrase_detail_tag,phrase_detail_pattern + --phrase_detail_function,phrase_detail_data,phrase_detail_method + --phrase_detail_type,phrase_detail_order + if (previous_phrase_uuid ~= row.phrase_uuid) then + if (x > 0) then + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); end - table.insert(xml, [[ ]]); - previous_phrase_uuid = row.phrase_uuid; - x = x + 1; - end); - if (x > 0) then - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + match_open_tag = true end - table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + previous_phrase_uuid = row.phrase_uuid; + x = x + 1; + end); + if (x > 0) then + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + end + table.insert(xml, [[ ]]); - --output xml & close previous file - table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); - table.insert(xml, [[
]]); - table.insert(xml, [[]]); - XML_STRING = table.concat(xml, "\n"); - end - - --log to the console - --freeswitch.consoleLog("notice", "[xml_handler] language " .. XML_STRING .. " \n"); - - --close the database connection - dbh:release(); - - --set the cache - if (domain_name) then - result = trim(api:execute("memcache", "set languages:" .. language .. ":" .. macro_name .." '"..XML_STRING:gsub("'", "'").."' "..expire["languages"])); - end - - --send the xml to the console - if (debug["xml_string"]) then - local file = assert(io.open(temp_dir .. "/xml_handler-" .. language .. "-" .. macro_name ..".xml", "w")); - file:write(XML_STRING); - file:close(); - end - - --send to the console - if (debug["cache"]) then - freeswitch.consoleLog("notice", "[xml_handler] languages:" .. language .. ":" .. macro_name .." source: database\n"); - end - end - end - - --get the XML string from the cache - if (source == "cache") then - --replace the ' back to a single quote - if (XML_STRING) then - XML_STRING = XML_STRING:gsub("'", "'"); - end - - --send to the console - if (debug["cache"]) then - if (XML_STRING) then - freeswitch.consoleLog("notice", "[xml_handler] language:" .. language .. ":" .. macro_name .." source: memcache \n"); + --output xml & close previous file + table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); + table.insert(xml, [[
]]); + table.insert(xml, [[]]); + XML_STRING = table.concat(xml, "\n"); end + + --log to the console + --freeswitch.consoleLog("notice", "[xml_handler] language " .. XML_STRING .. " \n"); + + --close the database connection + dbh:release(); + end + + --set the cache + local ok, err = cache.set(language_cache_key, XML_STRING, expire["acl"]); + if debug["cache"] then + if ok then + freeswitch.consoleLog("notice", "[xml_handler] " .. language_cache_key .. " stored in the cache\n"); + else + freeswitch.consoleLog("warning", "[xml_handler] " .. language_cache_key .. " can not be stored in the cache: " .. tostring(err) .. "\n"); end - end + end + + --send to the console + if (debug["cache"]) then + freeswitch.consoleLog("notice", "[xml_handler] " .. language_cache_key .. " source: database\n"); + end + else + --send to the console + if (debug["cache"]) then + freeswitch.consoleLog("notice", "[xml_handler] " .. language_cache_key .. " source: cache\n"); + end + end --if XML_STRING + +--send the xml to the console + if (debug["xml_string"]) then + local file = assert(io.open(temp_dir .. "/acl.conf.xml", "w")); + file:write(XML_STRING); + file:close(); + end --if the macro does not exist send "not found", don't cache the not found if (XML_STRING == nil or trim(XML_STRING) == "-ERR NOT FOUND") then