From 846886c00175089b9bbe88e72ee54a7d474ae412 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 20 Mar 2017 10:41:47 -0400 Subject: [PATCH] TT#13000 include recording filename suffix in db data Change-Id: If8a90b95b8f05f3ebc9408b95c30c8246844373d --- recording-daemon/db.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/recording-daemon/db.c b/recording-daemon/db.c index 2804212ba..d8abbf186 100644 --- a/recording-daemon/db.c +++ b/recording-daemon/db.c @@ -71,7 +71,7 @@ static int check_conn() { if (prep(&stm_insert_stream, "insert into recording_streams (`call`, local_filename, full_filename, " \ "file_format, " \ "output_type, " \ - "stream_id, ssrc) values (?,?,?,?,?,?,?)")) + "stream_id, ssrc) values (?,concat(?,'.',?),concat(?,'.',?),?,?,?,?)")) goto err; if (prep(&stm_close_call, "update recording_calls set end_time = now() where id = ?")) goto err; @@ -171,19 +171,21 @@ void db_do_stream(metafile_t *mf, output_t *op, const char *type, unsigned int i if (op->db_id > 0) return; - MYSQL_BIND b[7]; + MYSQL_BIND b[9]; my_ull(&b[0], &mf->db_id); my_str(&b[1], op->file_name); - my_str(&b[2], op->full_filename); - my_str(&b[3], op->file_format); - my_str(&b[4], type); - b[5] = (MYSQL_BIND) { + my_str(&b[2], op->file_format); + my_str(&b[3], op->full_filename); + my_str(&b[4], op->file_format); + my_str(&b[5], op->file_format); + my_str(&b[6], type); + b[7] = (MYSQL_BIND) { .buffer_type = MYSQL_TYPE_LONG, .buffer = &id, .buffer_length = sizeof(id), .is_unsigned = 1, }; - b[6] = (MYSQL_BIND) { + b[8] = (MYSQL_BIND) { .buffer_type = MYSQL_TYPE_LONG, .buffer = &ssrc, .buffer_length = sizeof(ssrc),