<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15331] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15331">15331</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-11-03 11:57:44 -0600 (Tue, 03 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix minor bugs
make whitepages work if regular url not set (oops)
channel var set for area
ignore "UNKNOWN" and "UNAVAILABLE" from api</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc">freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (15330 => 15331)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-11-03 16:52:22 UTC (rev 15330)
+++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-11-03 17:57:44 UTC (rev 15331)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> SWITCH_CONFIG_ITEM("cache", SWITCH_CONFIG_BOOL, CONFIG_RELOAD, &globals.cache, SWITCH_FALSE, NULL, "true|false", "whether to cache via cidlookup"),
</span><span class="cx"> SWITCH_CONFIG_ITEM("cache-expire", SWITCH_CONFIG_INT, CONFIG_RELOAD, &globals.cache_expire, (void *)300, NULL, "expire", "seconds to preserve num->name cache"),
</span><span class="cx"> SWITCH_CONFIG_ITEM_STRING_STRDUP("sql", CONFIG_RELOAD, &globals.sql, "", "sql whre number=${caller_id_number}", "SQL to run if overriding CID"),
</span><del>- SWITCH_CONFIG_ITEM_STRING_STRDUP("citystate-sql", CONFIG_RELOAD, &globals.citystate_sql, "", "sql to look up city/state info", "SQL to run if overriding CID"),
</del><ins>+ SWITCH_CONFIG_ITEM_STRING_STRDUP("citystate-sql", CONFIG_RELOAD, &globals.citystate_sql, NULL, "sql to look up city/state info", "SQL to run if overriding CID"),
</ins><span class="cx"> SWITCH_CONFIG_ITEM_CALLBACK("odbc-dsn", SWITCH_CONFIG_STRING, CONFIG_RELOAD, &globals.odbc_dsn, "", config_callback_dsn, &config_opt_dsn,
</span><span class="cx"> "db:user:passwd", "Database to use."),
</span><span class="cx"> SWITCH_CONFIG_ITEM_END()
</span><span class="lines">@@ -328,14 +328,18 @@
</span><span class="cx"> !zstr((char *)http_data.stream.data) &&
</span><span class="cx"> strcmp(" ", http_data.stream.data) ) {
</span><span class="cx">
</span><del>- name = switch_core_strdup(pool, http_data.stream.data);
</del><ins>+ /* don't return UNKNOWN */
+ if (strcmp("UNKNOWN", http_data.stream.data) ||
+ strcmp("UNAVAILABLE", http_data.stream.data)) {
+ name = switch_core_strdup(pool, http_data.stream.data);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_safe_free(http_data.stream.data);
</span><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static char *do_whitepages_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, switch_bool_t *areaonly)
</del><ins>+static char *do_whitepages_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, char **area)
</ins><span class="cx"> {
</span><span class="cx"> char *xml_s = NULL;
</span><span class="cx"> char *query = NULL;
</span><span class="lines">@@ -352,6 +356,8 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_assert(area);
+
</ins><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "whitepages-cid", num);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "whitepages-api-key", globals.whitepages_apikey);
</span><span class="cx">
</span><span class="lines">@@ -365,20 +371,19 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *areaonly = SWITCH_FALSE;
-
</del><span class="cx"> /* try for bizname first */
</span><span class="cx"> node = switch_xml_get(xml, "wp:listings", 0, "wp:listing", 0, "wp:business", 0, "wp:businessname", -1);
</span><span class="cx"> if (node) {
</span><span class="cx"> name = switch_core_strdup(pool, switch_xml_txt(node));
</span><del>- goto done;
</del><ins>+ goto area;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> node = switch_xml_get(xml, "wp:listings", 0, "wp:listing", 0, "wp:displayname", -1);
</span><span class="cx"> if (node) {
</span><span class="cx"> name = switch_core_strdup(pool, switch_xml_txt(node));
</span><del>- goto done;
</del><span class="cx"> }
</span><ins>+
+area:
</ins><span class="cx">
</span><span class="cx"> node = switch_xml_get(xml, "wp:listings", 0, "wp:listing", 0, "wp:address", 0, "wp:city", -1);
</span><span class="cx"> if (node) {
</span><span class="lines">@@ -391,8 +396,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (city || state) {
</span><del>- *areaonly = SWITCH_TRUE;
- name = switch_core_sprintf(pool, "%s %s", city ? city : "", state ? state : "");
</del><ins>+ *area = switch_core_sprintf(pool, "%s %s", city ? city : "", state ? state : "");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> done:
</span><span class="lines">@@ -404,7 +408,7 @@
</span><span class="cx"> switch_xml_free(xml);
</span><span class="cx"> }
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "whitepages XML: %s\n", xml_s);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "whitepages name: %s\n", name ? name : "(null)");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "whitepages name: %s, area: %s\n", name ? name : "(null)", *area ? *area : "(null)");
</ins><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -435,63 +439,72 @@
</span><span class="cx"> char *area = NULL;
</span><span class="cx"> char *url_query = NULL;
</span><span class="cx"> char *src = NULL;
</span><del>- switch_bool_t areaonly = SWITCH_FALSE;
-
</del><ins>+
</ins><span class="cx"> number = string_digitsonly(pool, num);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "caller_id_number", number);
</span><span class="cx">
</span><span class="cx"> /* database always wins */
</span><span class="cx"> if (switch_odbc_available() && globals.master_odbc && globals.sql) {
</span><span class="cx"> name = do_db_lookup(pool, event, number, globals.sql);
</span><del>- src = "database";
</del><ins>+ if (name) {
+ src = "database";
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!name && globals.url) {
</del><ins>+ if (!name && (globals.url || globals.whitepages_apikey)) {
</ins><span class="cx"> if (globals.cache) {
</span><span class="cx"> name = check_cache(pool, number);
</span><del>- src = "cache";
</del><ins>+ if (name) {
+ src = "cache";
+ }
</ins><span class="cx"> }
</span><del>- if (!skipurl && !name) {
- name = do_whitepages_lookup(pool, event, number, &areaonly);
- src = "whitepages";
- if (areaonly) {
- if (!skipcitystate) {
- area = name; /* preserve if we're not skipping city/state */
</del><ins>+ if (!skipurl && !name && globals.whitepages_apikey) {
+ name = do_whitepages_lookup(pool, event, number, &area);
+ if (area || name) {
+ src = "whitepages";
+ }
+ if (name) {
+ if (globals.cache) {
+ set_cache(pool, number, name);
</ins><span class="cx"> }
</span><del>- name = NULL; /* always clear out name */
</del><span class="cx"> }
</span><del>- if (globals.cache && name) {
- set_cache(pool, number, name);
- }
</del><span class="cx"> }
</span><del>- if (!skipurl && !name) {
</del><ins>+ if (!skipurl && !name && globals.url) {
</ins><span class="cx"> url_query = switch_event_expand_headers(event, globals.url);
</span><span class="cx"> name = do_lookup_url(pool, event, url_query);
</span><del>- src = "url";
</del><ins>+ if (name) {
+ src = "url";
+ if (globals.cache) {
+ set_cache(pool, number, name);
+ }
+ }
</ins><span class="cx"> if (url_query != globals.url) {
</span><span class="cx"> switch_safe_free(url_query);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* store and use preserved area info */
- if (!name && area) {
- src = "whitepages";
- name = area;
- }
- if (globals.cache && name) {
- set_cache(pool, number, name);
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><del>- /* only do the below if it is a nanpa number */
- if (!skipcitystate && strlen(number) == 11 && number[0] == '1' &&
- !name && switch_odbc_available() && globals.master_odbc && globals.citystate_sql) {
</del><ins>+ /* only do the below if we don't know anything about the # and it is a nanpa number */
+ if (!area && !name &&
+ !skipcitystate &&
+ strlen(number) == 11 && number[0] == '1' &&
+ switch_odbc_available() && globals.master_odbc && globals.citystate_sql) {
</ins><span class="cx">
</span><del>- name = do_db_lookup(pool, event, number, globals.citystate_sql);
</del><ins>+ area = do_db_lookup(pool, event, number, globals.citystate_sql);
</ins><span class="cx"> src = "npanxx";
</span><span class="cx"> }
</span><ins>+
+ if (!name && area) {
+ name = area;
+ }
+
+ if (!name) {
+ name = "UNKNOWN";
+ }
</ins><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cidlookup source: %s\n", src);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "cidlookup_source", src);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cidlookup source: %s\n", src ? src : "none");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "cidlookup_source", src ? src : "none");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "cidlookup_area", area ? area : "unknown");
</ins><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -550,6 +563,9 @@
</span><span class="cx"> if (!zstr(switch_event_get_header(event, "cidlookup_source"))) {
</span><span class="cx"> switch_channel_set_variable(channel, "cidlookup_source", switch_core_strdup(pool, switch_event_get_header(event, "cidlookup_source")));
</span><span class="cx"> }
</span><ins>+ if (!zstr(switch_event_get_header(event, "cidlookup_area"))) {
+ switch_channel_set_variable(channel, "cidlookup_area", switch_core_strdup(pool, switch_event_get_header(event, "cidlookup_area")));
+ }
</ins><span class="cx"> profile->caller_id_name = switch_core_strdup(profile->pool, name);;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -596,14 +612,14 @@
</span><span class="cx">
</span><span class="cx"> if (!strcmp("status", argv[0])) {
</span><span class="cx"> stream->write_function(stream, "+OK\n url: %s\n cache: %s\n cache-expire: %d\n",
</span><del>- globals.url,
</del><ins>+ globals.url ? globals.url : "(null)",
</ins><span class="cx"> (globals.cache) ? "true" : "false",
</span><span class="cx"> globals.cache_expire);
</span><span class="cx">
</span><span class="cx"> stream->write_function(stream, " odbc-dsn: %s\n sql: %s\n citystate-sql: %s\n",
</span><del>- globals.odbc_dsn,
- globals.sql,
- globals.citystate_sql);
</del><ins>+ globals.odbc_dsn ? globals.odbc_dsn : "(null)",
+ globals.sql ? globals.sql : "(null)",
+ globals.citystate_sql ? globals.citystate_sql : "(null)");
</ins><span class="cx"> stream->write_function(stream, " ODBC Compiled: %s\n", switch_odbc_available() ? "true" : "false");
</span><span class="cx">
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, done);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>