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

FS-4581: --resolve use specific column names in telecast web_callback

This commit is contained in:
Michael Jerris 2012-08-31 17:11:08 -04:00 committed by Ken Rice
parent 521c8d32e8
commit 460d5d9eeb
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mod/formats/mod_shout/mod_shout.c
View File

@ -1161,33 +1161,25 @@ static int web_callback(void *pArg, int argc, char **argv, char **columnNames)
char title_b4[128] = ""; char title_b4[128] = "";
char title_aft[128 * 3 + 1] = ""; char title_aft[128 * 3 + 1] = "";
char *mp3, *m3u; char *mp3, *m3u;
const char *uuid = argv[0];
/* const char *created = argv[1];
0 uuid VARCHAR(255), const char *cid_name = argv[2];
1 created VARCHAR(255), const char *cid_num = argv[3];
2 name VARCHAR(255), const char *dest = argv[4];
3 state VARCHAR(255), const char *application = argv[5] ? argv[5] : "N/A";
4 cid_name VARCHAR(255), const char *application_data = argv[6] ? argv[6] : "N/A";
5 cid_num VARCHAR(255), const char *read_codec = argv[7];
6 ip_addr VARCHAR(255), const char *read_rate = argv[8];
7 dest VARCHAR(255),
8 application VARCHAR(255),
9 application_data VARCHAR(255),
10 read_codec VARCHAR(255),
11 read_rate VARCHAR(255),
12 write_codec VARCHAR(255),
13 write_rate VARCHAR(255)
*/
holder->stream->write_function(holder->stream, holder->stream->write_function(holder->stream,
"<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>", "<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>",
argv[1], argv[4], argv[5], argv[7], argv[8] ? argv[8] : "N/A", argv[9] ? argv[9] : "N/A", argv[10], argv[11]); created, cid_name, cid_num, dest, application, application_data, read_codec, read_rate);
snprintf(title_b4, sizeof(title_b4), "%s <%s>", argv[4], argv[5]); snprintf(title_b4, sizeof(title_b4), "%s <%s>", cid_name, cid_num);
switch_url_encode(title_b4, title_aft, sizeof(title_aft)); switch_url_encode(title_b4, title_aft, sizeof(title_aft));
mp3 = switch_mprintf("http://%s:%s%s/mp3/%s/%s.mp3", holder->host, holder->port, holder->uri, argv[0], argv[5]); mp3 = switch_mprintf("http://%s:%s%s/mp3/%s/%s.mp3", holder->host, holder->port, holder->uri, uuid, cid_num);
m3u = switch_mprintf("http://%s:%s%s/m3u/mp3/%s/%s.mp3.m3u", holder->host, holder->port, holder->uri, argv[0], argv[5]); m3u = switch_mprintf("http://%s:%s%s/m3u/mp3/%s/%s.mp3.m3u", holder->host, holder->port, holder->uri, uuid, cid_num);
holder->stream->write_function(holder->stream, "[<a href=%s>mp3</a>] ", mp3); holder->stream->write_function(holder->stream, "[<a href=%s>mp3</a>] ", mp3);
holder->stream->write_function(holder->stream, "[<a href=%s>m3u</a>]</td></tr>\n", m3u); holder->stream->write_function(holder->stream, "[<a href=%s>m3u</a>]</td></tr>\n", m3u);
@ -1411,7 +1403,7 @@ void do_broadcast(switch_stream_handle_t *stream)
void do_index(switch_stream_handle_t *stream) void do_index(switch_stream_handle_t *stream)
{ {
switch_cache_db_handle_t *db; switch_cache_db_handle_t *db;
const char *sql = "select * from channels"; const char *sql = "select uuid, created, cid_name, cid_num, dest, application, application_data, read_codec, read_rate from channels";
struct holder holder; struct holder holder;
char *errmsg; char *errmsg;