From 24be63aa3bf9883f1af441954f137d20521f8f69 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Tue, 9 Sep 2014 11:03:00 +0000 Subject: [PATCH] Add fax_uuid to the fax_retry.lua script --- resources/install/scripts/fax_retry.lua | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/resources/install/scripts/fax_retry.lua b/resources/install/scripts/fax_retry.lua index f303260a77..271aacb58e 100644 --- a/resources/install/scripts/fax_retry.lua +++ b/resources/install/scripts/fax_retry.lua @@ -124,26 +124,36 @@ --get the values from the fax file array = explode("/", fax_file); domain_name = array[count(array)-3]; - extension_name = array[count(array)-2]; + fax_extension = array[count(array)-2]; file_name = array[count(array)]; --get the domain_uuid using the domain name required for multi-tenant if (domain_name ~= nil) then sql = "SELECT domain_uuid FROM v_domains "; sql = sql .. "WHERE domain_name = '" .. domain_name .. "' "; - if (debug["sql"]) then - freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n"); - end status = dbh:query(sql, function(rows) domain_uuid = rows["domain_uuid"]; end); end +--get the domain_uuid using the domain name required for multi-tenant + if (domain_uuid ~= nil and fax_extension ~= nil) then + sql = "SELECT fax_uuid FROM v_fax "; + sql = sql .. "WHERE domain_uuid = '" .. domain_uuid .. "' "; + sql = sql .. "AND fax_extension = '" .. fax_extension .. "' "; + status = dbh:query(sql, function(rows) + fax_uuid = rows["fax_uuid"]; + end); + end + --add to fax logs sql = "insert into v_fax_logs "; sql = sql .. "("; sql = sql .. "fax_log_uuid, "; sql = sql .. "domain_uuid, "; + if (fax_uuid ~= nil) then + sql = sql .. "fax_uuid, "; + end sql = sql .. "fax_success, "; sql = sql .. "fax_result_code, "; sql = sql .. "fax_result_text, "; @@ -185,6 +195,9 @@ sql = sql .. "("; sql = sql .. "'"..uuid.."', "; sql = sql .. "'"..domain_uuid.."', "; + if (fax_uuid ~= nil) then + sql = sql .. "'"..fax_uuid.."', "; + end sql = sql .. "'"..fax_success.."', "; sql = sql .. "'"..fax_result_code .."', "; sql = sql .. "'"..fax_result_text.."', ";