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

FS-3911 --resolve patch applied

This commit is contained in:
Raymond Chandler 2013-07-10 10:52:40 -04:00
parent 2f2a879138
commit 2ec821b74b
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mod/applications/mod_commands/mod_commands.c
View File

@ -4390,7 +4390,11 @@ static int show_as_json_callback(void *pArg, int argc, char **argv, char **colum
} }
if (holder->justcount) { if (holder->justcount) {
holder->count++; if (zstr(argv[0])) {
holder->count = 0;
} else {
holder->count = (uint32_t) atoi(argv[0]);
}
return 0; return 0;
} }
@ -4430,7 +4434,11 @@ static int show_as_xml_callback(void *pArg, int argc, char **argv, char **column
} }
if (holder->justcount) { if (holder->justcount) {
holder->count++; if (zstr(argv[0])) {
holder->count = 0;
} else {
holder->count = (uint32_t) atoi(argv[0]);
}
return 0; return 0;
} }
@ -4468,7 +4476,11 @@ static int show_callback(void *pArg, int argc, char **argv, char **columnNames)
int x; int x;
if (holder->justcount) { if (holder->justcount) {
holder->count++; if (zstr(argv[0])) {
holder->count = 0;
} else {
holder->count = (uint32_t) atoi(argv[0]);
}
return 0; return 0;
} }
@ -4704,6 +4716,7 @@ SWITCH_STANDARD_API(show_function)
if (!strcasecmp(command, "calls")) { if (!strcasecmp(command, "calls")) {
sprintf(sql, "select * from basic_calls where hostname='%s' order by call_created_epoch", hostname); sprintf(sql, "select * from basic_calls where hostname='%s' order by call_created_epoch", hostname);
if (argv[1] && !strcasecmp(argv[1], "count")) { if (argv[1] && !strcasecmp(argv[1], "count")) {
sprintf(sql, "select count(*) from basic_calls where hostname='%s'", hostname);
holder.justcount = 1; holder.justcount = 1;
if (argv[3] && !strcasecmp(argv[2], "as")) { if (argv[3] && !strcasecmp(argv[2], "as")) {
as = argv[3]; as = argv[3];
@ -4712,6 +4725,7 @@ SWITCH_STANDARD_API(show_function)
} else if (!strcasecmp(command, "registrations")) { } else if (!strcasecmp(command, "registrations")) {
sprintf(sql, "select * from registrations where hostname='%s'", hostname); sprintf(sql, "select * from registrations where hostname='%s'", hostname);
if (argv[1] && !strcasecmp(argv[1], "count")) { if (argv[1] && !strcasecmp(argv[1], "count")) {
sprintf(sql, "select count(*) from registrations where hostname='%s'", hostname);
holder.justcount = 1; holder.justcount = 1;
if (argv[3] && !strcasecmp(argv[2], "as")) { if (argv[3] && !strcasecmp(argv[2], "as")) {
as = argv[3]; as = argv[3];
@ -4743,6 +4757,7 @@ SWITCH_STANDARD_API(show_function)
} else if (!strcasecmp(command, "channels")) { } else if (!strcasecmp(command, "channels")) {
sprintf(sql, "select * from channels where hostname='%s' order by created_epoch", hostname); sprintf(sql, "select * from channels where hostname='%s' order by created_epoch", hostname);
if (argv[1] && !strcasecmp(argv[1], "count")) { if (argv[1] && !strcasecmp(argv[1], "count")) {
sprintf(sql, "select count(*) from channels where hostname='%s'", hostname);
holder.justcount = 1; holder.justcount = 1;
if (argv[3] && !strcasecmp(argv[2], "as")) { if (argv[3] && !strcasecmp(argv[2], "as")) {
as = argv[3]; as = argv[3];