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

formatting 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6031 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-10-23 15:09:29 +00:00
parent bbb7e4d499
commit 20997307da
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -145,10 +145,10 @@ static switch_status_t vm_execute_sql(vm_profile_t *profile, char *sql, switch_m
static switch_bool_t vm_execute_sql_callback(vm_profile_t *profile, static switch_bool_t vm_execute_sql_callback(vm_profile_t *profile,
switch_mutex_t *mutex, switch_mutex_t *mutex,
char *sql, char *sql,
switch_core_db_callback_func_t callback, switch_core_db_callback_func_t callback,
void *pdata) void *pdata)
{ {
switch_bool_t ret = SWITCH_FALSE; switch_bool_t ret = SWITCH_FALSE;
switch_core_db_t *db; switch_core_db_t *db;
@ -1648,56 +1648,56 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, char
TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, NULL)); TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, NULL));
} }
status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path); status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path);
if ((status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) && switch_channel_ready(channel)) { if ((status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) && switch_channel_ready(channel)) {
char input[10] = "", key_buf[80] = "", term = 0; char input[10] = "", key_buf[80] = "", term = 0;
snprintf(key_buf, sizeof(key_buf), "%s:%s", snprintf(key_buf, sizeof(key_buf), "%s:%s",
profile->urgent_key, profile->urgent_key,
profile->terminator_key); profile->terminator_key);
vm_macro_get(session, VM_RECORD_URGENT_CHECK_MACRO, key_buf, input, sizeof(input), 1, "", &term, profile->digit_timeout); vm_macro_get(session, VM_RECORD_URGENT_CHECK_MACRO, key_buf, input, sizeof(input), 1, "", &term, profile->digit_timeout);
if (*profile->urgent_key == *input) { if (*profile->urgent_key == *input) {
read_flags = URGENT_FLAG_STRING; read_flags = URGENT_FLAG_STRING;
priority = 1; priority = 1;
TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "marked-urgent", NULL, NULL)); TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "marked-urgent", NULL, NULL));
} else { } else {
TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "saved", NULL, NULL)); TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "saved", NULL, NULL));
}
} }
}
/* TRX a race condition exists where you hang up right as you start to record, the recording subsystem detects there isnt /* TRX a race condition exists where you hang up right as you start to record, the recording subsystem detects there isnt
* a channel and refuses to create the file, as a result you get DB entries and MWI entries when there is no voicemail saved * a channel and refuses to create the file, as a result you get DB entries and MWI entries when there is no voicemail saved
* message counts and other things get out of sync * message counts and other things get out of sync
*/ */
if(!send_mail && switch_file_exists(file_path,switch_core_session_get_pool(session))==SWITCH_STATUS_SUCCESS) { if(!send_mail && switch_file_exists(file_path,switch_core_session_get_pool(session))==SWITCH_STATUS_SUCCESS) {
char *usql; char *usql;
switch_event_t *event; switch_event_t *event;
char *mwi_id = NULL; char *mwi_id = NULL;
int total_new_messages = 0; int total_new_messages = 0;
int total_saved_messages = 0; int total_saved_messages = 0;
int total_new_urgent_messages = 0; int total_new_urgent_messages = 0;
int total_saved_urgent_messages = 0; int total_saved_urgent_messages = 0;
usql = switch_mprintf("insert into voicemail_data values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','','%q')", (long)time(NULL), usql = switch_mprintf("insert into voicemail_data values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','','%q')", (long)time(NULL),
id, domain_name, uuid, caller_profile->caller_id_name, caller_profile->caller_id_number, myfolder, file_path, read_flags); id, domain_name, uuid, caller_profile->caller_id_name, caller_profile->caller_id_number, myfolder, file_path, read_flags);
vm_execute_sql(profile, usql, profile->mutex); vm_execute_sql(profile, usql, profile->mutex);
switch_safe_free(usql); switch_safe_free(usql);
message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages,
&total_new_urgent_messages, &total_saved_urgent_messages); &total_new_urgent_messages, &total_saved_urgent_messages);
if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) {
mwi_id = switch_mprintf("%s@%s", id, domain_name); mwi_id = switch_mprintf("%s@%s", id, domain_name);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes");
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)",
total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages);
switch_event_fire(&event); switch_event_fire(&event);
switch_safe_free(mwi_id); switch_safe_free(mwi_id);
} }
} }
end: end: