From 495bafd3f5df3f45967d2fac65cd4d5975454871 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Mon, 25 Jan 2016 16:53:09 -0700 Subject: [PATCH] Remove the recordings_dir with automatic domain_name and add domain_name in a few places where it was missing. --- .../scripts/configuration/ivr.conf.lua | 202 +++++++++--------- resources/install/scripts/ivr_menu.lua | 20 +- 2 files changed, 110 insertions(+), 112 deletions(-) diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua index 48e66c1f5f..df90f0206d 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua @@ -77,115 +77,115 @@ ivr_menu_description = row["ivr_menu_description"]; end); ---get the recordings from the database - ivr_menu_greet_long_is_base64 = false; - ivr_menu_greet_short_is_base64 = false; - ivr_menu_invalid_sound_is_base64 = false; - ivr_menu_exit_sound_is_base64 = false; - if (storage_type == "base64") then - --greet long - if (string.len(ivr_menu_greet_long) > 1) then - if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_long)) then - sql = [[SELECT * FROM v_recordings - WHERE domain_uuid = ']]..domain_uuid..[[' - AND recording_filename = ']]..ivr_menu_greet_long..[[' ]]; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); - end - status = dbh:query(sql, function(row) - --add functions - require "resources.functions.base64"; - --add the path to filename - ivr_menu_greet_long = recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_long; - ivr_menu_greet_long_is_base64 = true; - --save the recording to the file system - if (string.len(row["recording_base64"]) > 32) then - local file = io.open(ivr_menu_greet_long, "w"); - file:write(base64.decode(row["recording_base64"])); - file:close(); + --get the recordings from the database + ivr_menu_greet_long_is_base64 = false; + ivr_menu_greet_short_is_base64 = false; + ivr_menu_invalid_sound_is_base64 = false; + ivr_menu_exit_sound_is_base64 = false; + if (storage_type == "base64") then + --greet long + if (string.len(ivr_menu_greet_long) > 1) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_long)) then + sql = [[SELECT * FROM v_recordings + WHERE domain_uuid = ']]..domain_uuid..[[' + AND recording_filename = ']]..ivr_menu_greet_long..[[' ]]; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); end - end); - end - end - --greet short - if (string.len(ivr_menu_greet_short) > 1) then - if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_short)) then - sql = [[SELECT * FROM v_recordings - WHERE domain_uuid = ']]..domain_uuid..[[' - AND recording_filename = ']]..ivr_menu_greet_short..[[' ]]; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); + status = dbh:query(sql, function(row) + --add functions + require "resources.functions.base64"; + --add the path to filename + ivr_menu_greet_long = recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_long; + ivr_menu_greet_long_is_base64 = true; + --save the recording to the file system + if (string.len(row["recording_base64"]) > 32) then + local file = io.open(ivr_menu_greet_long, "w"); + file:write(base64.decode(row["recording_base64"])); + file:close(); + end + end); + end end - status = dbh:query(sql, function(row) - --add functions - require "resources.functions.base64"; - --add the path to filename - ivr_menu_greet_short = recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_short; - ivr_menu_greet_short_is_base64 = true; - --save the recording to the file system - if (string.len(row["recording_base64"]) > 32) then - local file = io.open(ivr_menu_greet_short, "w"); - file:write(base64.decode(row["recording_base64"])); - file:close(); + --greet short + if (string.len(ivr_menu_greet_short) > 1) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_short)) then + sql = [[SELECT * FROM v_recordings + WHERE domain_uuid = ']]..domain_uuid..[[' + AND recording_filename = ']]..ivr_menu_greet_short..[[' ]]; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); end - end); - end - end - --invalid sound - if (string.len(ivr_menu_invalid_sound) > 1) then - if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_invalid_sound)) then - sql = [[SELECT * FROM v_recordings - WHERE domain_uuid = ']]..domain_uuid..[[' - AND recording_filename = ']]..ivr_menu_invalid_sound..[[' ]]; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); + status = dbh:query(sql, function(row) + --add functions + require "resources.functions.base64"; + --add the path to filename + ivr_menu_greet_short = recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_short; + ivr_menu_greet_short_is_base64 = true; + --save the recording to the file system + if (string.len(row["recording_base64"]) > 32) then + local file = io.open(ivr_menu_greet_short, "w"); + file:write(base64.decode(row["recording_base64"])); + file:close(); + end + end); + end end - status = dbh:query(sql, function(row) - --add functions - require "resources.functions.base64"; - --add the path to filename - ivr_menu_invalid_sound = recordings_dir..domain_name.."/".."/"..ivr_menu_invalid_sound; - ivr_menu_invalid_sound_is_base64 = true; - --save the recording to the file system - if (string.len(row["recording_base64"]) > 32) then - local file = io.open(ivr_menu_invalid_sound, "w"); - file:write(base64.decode(row["recording_base64"])); - file:close(); + --invalid sound + if (string.len(ivr_menu_invalid_sound) > 1) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_invalid_sound)) then + sql = [[SELECT * FROM v_recordings + WHERE domain_uuid = ']]..domain_uuid..[[' + AND recording_filename = ']]..ivr_menu_invalid_sound..[[' ]]; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); end - end); - end - end - --exit sound - if (string.len(ivr_menu_exit_sound) > 1) then - if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_exit_sound)) then - sql = [[SELECT * FROM v_recordings - WHERE domain_uuid = ']]..domain_uuid..[[' - AND recording_filename = ']]..ivr_menu_exit_sound..[[' ]]; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); + status = dbh:query(sql, function(row) + --add functions + require "resources.functions.base64"; + --add the path to filename + ivr_menu_invalid_sound = recordings_dir..domain_name.."/".."/"..ivr_menu_invalid_sound; + ivr_menu_invalid_sound_is_base64 = true; + --save the recording to the file system + if (string.len(row["recording_base64"]) > 32) then + local file = io.open(ivr_menu_invalid_sound, "w"); + file:write(base64.decode(row["recording_base64"])); + file:close(); + end + end); + end end - status = dbh:query(sql, function(row) - --add functions - require "resources.functions.base64"; - --add the path to filename - ivr_menu_exit_sound = recordings_dir.."/"..domain_name.."/"..ivr_menu_exit_sound; - ivr_menu_exit_sound_is_base64 = true; - --save the recording to the file system - if (string.len(row["recording_base64"]) > 32) then - local file = io.open(ivr_menu_exit_sound, "w"); - file:write(base64.decode(row["recording_base64"])); - file:close(); + --exit sound + if (string.len(ivr_menu_exit_sound) > 1) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_exit_sound)) then + sql = [[SELECT * FROM v_recordings + WHERE domain_uuid = ']]..domain_uuid..[[' + AND recording_filename = ']]..ivr_menu_exit_sound..[[' ]]; + if (debug["sql"]) then + freeswitch.consoleLog("notice", "[ivr_menu] SQL: "..sql.."\n"); end - end); - end + status = dbh:query(sql, function(row) + --add functions + require "resources.functions.base64"; + --add the path to filename + ivr_menu_exit_sound = recordings_dir.."/"..domain_name.."/"..ivr_menu_exit_sound; + ivr_menu_exit_sound_is_base64 = true; + --save the recording to the file system + if (string.len(row["recording_base64"]) > 32) then + local file = io.open(ivr_menu_exit_sound, "w"); + file:write(base64.decode(row["recording_base64"])); + file:close(); + end + end); + end + end + elseif (storage_type == "http_cache") then + --add the path to file name + ivr_menu_greet_long = storage_path.."/"..ivr_menu_greet_long; + ivr_menu_greet_short = storage_path.."/"..ivr_menu_greet_short; + ivr_menu_invalid_sound = storage_path.."/"..ivr_menu_invalid_sound; + ivr_menu_exit_sound = storage_path.."/"..ivr_menu_exit_sound; end - elseif (storage_type == "http_cache") then - --add the path to file name - ivr_menu_greet_long = storage_path.."/"..ivr_menu_greet_long; - ivr_menu_greet_short = storage_path.."/"..ivr_menu_greet_short; - ivr_menu_invalid_sound = storage_path.."/"..ivr_menu_invalid_sound; - ivr_menu_exit_sound = storage_path.."/"..ivr_menu_exit_sound; - end --greet long if (not file_exists(ivr_menu_greet_long)) then diff --git a/resources/install/scripts/ivr_menu.lua b/resources/install/scripts/ivr_menu.lua index d6961cfdde..25fef0210c 100644 --- a/resources/install/scripts/ivr_menu.lua +++ b/resources/install/scripts/ivr_menu.lua @@ -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, @@ -76,8 +76,6 @@ end end ---add the domain name to the recordings directory - recordings_dir = recordings_dir .. "/"..domain_name; --set default variable(s) tries = 0; @@ -202,7 +200,7 @@ if (storage_type == "base64") then --greet long if (string.len(ivr_menu_greet_long) > 1) then - if (not file_exists(recordings_dir.."/"..greet_long_file_name)) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..greet_long_file_name)) then sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..greet_long_file_name..[[' ]]; @@ -213,7 +211,7 @@ --add functions require "resources.functions.base64"; --add the path to filename - ivr_menu_greet_long = recordings_dir.."/"..greet_long_file_name; + ivr_menu_greet_long = recordings_dir.."/"..domain_name.."/"..greet_long_file_name; ivr_menu_greet_long_is_base64 = true; --save the recording to the file system if (string.len(row["recording_base64"]) > 32) then @@ -226,7 +224,7 @@ end --greet short if (string.len(ivr_menu_greet_short) > 1) then - if (not file_exists(recordings_dir.."/"..greet_short_file_name)) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..greet_short_file_name)) then sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..greet_short_file_name..[[' ]]; @@ -237,7 +235,7 @@ --add functions require "resources.functions.base64"; --add the path to filename - ivr_menu_greet_short = recordings_dir.."/"..greet_short_file_name; + ivr_menu_greet_short = recordings_dir.."/"..domain_name.."/"..greet_short_file_name; ivr_menu_greet_short_is_base64 = true; --save the recording to the file system if (string.len(row["recording_base64"]) > 32) then @@ -250,7 +248,7 @@ end --invalid sound if (string.len(ivr_menu_invalid_sound) > 1) then - if (not file_exists(recordings_dir.."/"..invalid_sound_file_name)) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..invalid_sound_file_name)) then sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..invalid_sound_file_name..[[' ]]; @@ -261,7 +259,7 @@ --add functions require "resources.functions.base64"; --add the path to filename - ivr_menu_invalid_sound = recordings_dir.."/"..invalid_sound_file_name; + ivr_menu_invalid_sound = recordings_dir.."/"..domain_name.."/"..invalid_sound_file_name; ivr_menu_invalid_sound_is_base64 = true; --save the recording to the file system if (string.len(row["recording_base64"]) > 32) then @@ -274,7 +272,7 @@ end --exit sound if (string.len(ivr_menu_exit_sound) > 1) then - if (not file_exists(recordings_dir.."/"..exit_sound_file_name)) then + if (not file_exists(recordings_dir.."/"..domain_name.."/"..exit_sound_file_name)) then sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..exit_sound_file_name..[[' ]]; @@ -285,7 +283,7 @@ --add functions require "resources.functions.base64"; --add the path to filename - ivr_menu_exit_sound = recordings_dir.."/"..exit_sound_file_name; + ivr_menu_exit_sound = recordings_dir.."/"..domain_name.."/"..exit_sound_file_name; ivr_menu_exit_sound_is_base64 = true; --save the recording to the file system if (string.len(row["recording_base64"]) > 32) then