kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

actually look at skipfoo and add skipcitystate to api and app args 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14175 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Rupa Schomaker 2009-07-09 17:28:43 +00:00
parent 1a465c2305
commit 9f7eb74b48
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mod/applications/mod_cidlookup/mod_cidlookup.c
View File

@ -359,7 +359,7 @@ static char *do_db_lookup(switch_memory_pool_t *pool, switch_event_t *event, con
return name; return name;
} }
static char *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, switch_bool_t skipurl) { static char *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, switch_bool_t skipurl, switch_bool_t skipcitystate) {
char *number = NULL; char *number = NULL;
char *name = NULL; char *name = NULL;
@ -383,7 +383,7 @@ static char *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const
} }
} }
/* only do the below if it is a nanpa number */ /* only do the below if it is a nanpa number */
if (strlen(number) == 11 && number[0] == '1' && if (!skipcitystate && strlen(number) == 11 && number[0] == '1' &&
!name && switch_odbc_available() && globals.master_odbc && globals.citystate_sql) { !name && switch_odbc_available() && globals.master_odbc && globals.citystate_sql) {
name = do_db_lookup(pool, event, number, globals.citystate_sql); name = do_db_lookup(pool, event, number, globals.citystate_sql);
@ -395,9 +395,10 @@ SWITCH_STANDARD_APP(cidlookup_app_function)
{ {
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
char *argv[3] = { 0 }; char *argv[4] = { 0 };
int argc; int argc;
char *mydata = NULL; char *mydata = NULL;
int i;
switch_memory_pool_t *pool = NULL; switch_memory_pool_t *pool = NULL;
switch_event_t *event = NULL; switch_event_t *event = NULL;
@ -406,6 +407,7 @@ SWITCH_STANDARD_APP(cidlookup_app_function)
char *name = NULL; char *name = NULL;
const char *number = NULL; const char *number = NULL;
switch_bool_t skipurl = SWITCH_FALSE; switch_bool_t skipurl = SWITCH_FALSE;
switch_bool_t skipcitystate = SWITCH_FALSE;
if (session) { if (session) {
pool = switch_core_session_get_pool(session); pool = switch_core_session_get_pool(session);
@ -422,8 +424,12 @@ SWITCH_STANDARD_APP(cidlookup_app_function)
if (argc > 0) { if (argc > 0) {
number = switch_core_session_strdup(session, argv[0]); number = switch_core_session_strdup(session, argv[0]);
} }
if (argc > 1) { for (i = 1; i < argc; i++) {
skipurl = SWITCH_TRUE; if (!strcasecmp(argv[i], "skipurl")) {
skipurl = SWITCH_TRUE;
} else if (!strcasecmp(argv[i], "skipcitystate")) {
skipcitystate = SWITCH_TRUE;
}
} }
} }
@ -432,7 +438,7 @@ SWITCH_STANDARD_APP(cidlookup_app_function)
} }
if (number) { if (number) {
name = do_lookup(pool, event, number, skipurl); name = do_lookup(pool, event, number, skipurl, skipcitystate);
} }
if (name && channel) { if (name && channel) {
@ -453,14 +459,16 @@ done:
SWITCH_STANDARD_API(cidlookup_function) SWITCH_STANDARD_API(cidlookup_function)
{ {
switch_status_t status; switch_status_t status;
char *argv[3] = { 0 }; char *argv[4] = { 0 };
int argc; int argc;
int i;
char *name = NULL; char *name = NULL;
char *mydata = NULL; char *mydata = NULL;
switch_memory_pool_t *pool = NULL; switch_memory_pool_t *pool = NULL;
switch_event_t *event = NULL; switch_event_t *event = NULL;
switch_bool_t skipurl = SWITCH_FALSE; switch_bool_t skipurl = SWITCH_FALSE;
switch_bool_t skipcitystate = SWITCH_FALSE;
if (switch_strlen_zero(cmd)) { if (switch_strlen_zero(cmd)) {
switch_goto_status(SWITCH_STATUS_SUCCESS, usage); switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
@ -493,11 +501,15 @@ SWITCH_STANDARD_API(cidlookup_function)
switch_goto_status(SWITCH_STATUS_SUCCESS, done); switch_goto_status(SWITCH_STATUS_SUCCESS, done);
} }
if (argc > 1 && !strcmp("skipurl", argv[1])) { for (i = 1; i < argc; i++) {
skipurl = SWITCH_TRUE; if (!strcasecmp(argv[i], "skipurl")) {
skipurl = SWITCH_TRUE;
} else if (!strcasecmp(argv[i], "skipcitystate")) {
skipcitystate = SWITCH_TRUE;
}
} }
name = do_lookup(pool, event, argv[0], skipurl); name = do_lookup(pool, event, argv[0], skipurl, skipcitystate);
if (name) { if (name) {
stream->write_function(stream, name); stream->write_function(stream, name);
} else { } else {