<!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][14175] </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=14175">14175</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-07-09 12:28:43 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>actually look at skipfoo and add skipcitystate to api and app args</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 (14174 => 14175)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-07-09 16:41:49 UTC (rev 14174)
+++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-07-09 17:28:43 UTC (rev 14175)
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static char *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, switch_bool_t skipurl) {
</del><ins>+static char *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, switch_bool_t skipurl, switch_bool_t skipcitystate) {
</ins><span class="cx"> char *number = NULL;
</span><span class="cx"> char *name = NULL;
</span><span class="cx">
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> /* only do the below if it is a nanpa number */
</span><del>- if (strlen(number) == 11 && number[0] == '1' &&
</del><ins>+ if (!skipcitystate && strlen(number) == 11 && number[0] == '1' &&
</ins><span class="cx"> !name && switch_odbc_available() && globals.master_odbc && globals.citystate_sql) {
</span><span class="cx">
</span><span class="cx"> name = do_db_lookup(pool, event, number, globals.citystate_sql);
</span><span class="lines">@@ -395,9 +395,10 @@
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><del>- char *argv[3] = { 0 };
</del><ins>+ char *argv[4] = { 0 };
</ins><span class="cx"> int argc;
</span><span class="cx"> char *mydata = NULL;
</span><ins>+ int i;
</ins><span class="cx">
</span><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx"> switch_event_t *event = NULL;
</span><span class="lines">@@ -406,6 +407,7 @@
</span><span class="cx"> char *name = NULL;
</span><span class="cx"> const char *number = NULL;
</span><span class="cx"> switch_bool_t skipurl = SWITCH_FALSE;
</span><ins>+ switch_bool_t skipcitystate = SWITCH_FALSE;
</ins><span class="cx">
</span><span class="cx"> if (session) {
</span><span class="cx"> pool = switch_core_session_get_pool(session);
</span><span class="lines">@@ -422,8 +424,12 @@
</span><span class="cx"> if (argc > 0) {
</span><span class="cx"> number = switch_core_session_strdup(session, argv[0]);
</span><span class="cx"> }
</span><del>- if (argc > 1) {
- skipurl = SWITCH_TRUE;
</del><ins>+ for (i = 1; i < argc; i++) {
+ if (!strcasecmp(argv[i], "skipurl")) {
+ skipurl = SWITCH_TRUE;
+ } else if (!strcasecmp(argv[i], "skipcitystate")) {
+ skipcitystate = SWITCH_TRUE;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -432,7 +438,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (number) {
</span><del>- name = do_lookup(pool, event, number, skipurl);
</del><ins>+ name = do_lookup(pool, event, number, skipurl, skipcitystate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (name && channel) {
</span><span class="lines">@@ -453,14 +459,16 @@
</span><span class="cx"> SWITCH_STANDARD_API(cidlookup_function)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status;
</span><del>- char *argv[3] = { 0 };
</del><ins>+ char *argv[4] = { 0 };
</ins><span class="cx"> int argc;
</span><ins>+ int i;
</ins><span class="cx"> char *name = NULL;
</span><span class="cx"> char *mydata = NULL;
</span><span class="cx">
</span><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx"> switch_event_t *event = NULL;
</span><span class="cx"> switch_bool_t skipurl = SWITCH_FALSE;
</span><ins>+ switch_bool_t skipcitystate = SWITCH_FALSE;
</ins><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(cmd)) {
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
</span><span class="lines">@@ -493,11 +501,15 @@
</span><span class="cx">
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, done);
</span><span class="cx"> }
</span><del>- if (argc > 1 && !strcmp("skipurl", argv[1])) {
- skipurl = SWITCH_TRUE;
</del><ins>+ for (i = 1; i < argc; i++) {
+ if (!strcasecmp(argv[i], "skipurl")) {
+ skipurl = SWITCH_TRUE;
+ } else if (!strcasecmp(argv[i], "skipcitystate")) {
+ skipcitystate = SWITCH_TRUE;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- name = do_lookup(pool, event, argv[0], skipurl);
</del><ins>+ name = do_lookup(pool, event, argv[0], skipurl, skipcitystate);
</ins><span class="cx"> if (name) {
</span><span class="cx"> stream->write_function(stream, name);
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>