From 2b4fb544e5c11da89d8b47dcda1de5d483dbf56c Mon Sep 17 00:00:00 2001 From: luis daniel lucio quiroz Date: Mon, 11 Aug 2014 17:48:46 +0000 Subject: [PATCH] some nore details about cidlookup.conf.xml --- resources/install/scripts/cidlookup.lua | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/resources/install/scripts/cidlookup.lua b/resources/install/scripts/cidlookup.lua index e44dbd1262..7890e38737 100644 --- a/resources/install/scripts/cidlookup.lua +++ b/resources/install/scripts/cidlookup.lua @@ -66,17 +66,23 @@ sql = sql .. "WHERE v_contact_phones.phone_number = '"..caller.."' AND v_destinations.destination_number='"..callee.."'"; if (debug["sql"]) then - freeswitch.consoleLog("notice", "[call_forward] "..sql.."\n"); + freeswitch.consoleLog("notice", "[cidlookup] "..sql.."\n"); end status = dbh:query(sql, function(row) name = row.name; - --freeswitch.consoleLog("NOTICE", "[cidlookup] caller name from contacts db "..row.name.."\n"); end); + if (name == nil) then + freeswitch.consoleLog("NOTICE", "[cidlookup] caller name from contacts db is nil\n"); + else + freeswitch.consoleLog("NOTICE", "[cidlookup] caller name from contacts db "..name.."\n"); + end + --check if there is a record, if it doesnt, then use common cidlookup - if (string.len(name) == 0) then - name = api:executeString("cidlookup " .. number); - end + if ((name == nil) or (string.len(name) == 0)) then + name = api:executeString("cidlookup " .. caller); + end - api:executeString("uuid_setvar " .. uuid .. " effective_caller_id_name " .. name); + freeswitch.consoleLog("NOTICE", "uuid_setvar " .. uuid .. " caller_id_name " .. name); + api:executeString("uuid_setvar " .. uuid .. " caller_id_name " .. name);