From: Alec L Davis Date: Fri, 1 Apr 2011 08:47:29 +0000 (+0000) Subject: Merged revisions 312174 via svnmerge from X-Git-Tag: 1.6.2.19-rc1~3^2~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1063ef5dc06968d605864364f79ec421fb08b56;p=thirdparty%2Fasterisk.git Merged revisions 312174 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r312174 | alecdavis | 2011-04-01 21:29:49 +1300 (Fri, 01 Apr 2011) | 23 lines voicemail: get real last_message_index and count_messages, ODBC resequence change last_message_index to read the max msgnum stored in the database change count_messages to actually count the number of messages. last_message_index change: This fixed overwriting of the last message if msgnum=0 was missing. Previously every incoming message would overwrite msgnum=1. count_messages change: allows us to detect when requencing is required in opneA_mailbox. resequence enabled for ODBC storage: Assists with fixing up corrupt databases with gaps, but only when a user actively opens there mailboxes. (closes issue #18692,#18582,#19032) Reported by: elguero Patches: based on odbc_resequence_mailbox2.1.diff uploaded by elguero (license 37) Tested by: elguero, nivek, alecdavis Review: https://reviewboard.asterisk.org/r/1153/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@312210 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 66122b3f61..3e423c3763 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3243,7 +3243,7 @@ static int retrieve_file(char *dir, int msgnum) ast_odbc_release_obj(obj); } else ast_log(AST_LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); -yuck: +yuck: if (f) fclose(f); if (fd > -1) @@ -3274,7 +3274,8 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir) struct odbc_obj *obj; obj = ast_odbc_request_obj(odbc_database, 0); if (obj) { - snprintf(sql, sizeof(sql), "SELECT COUNT(*) FROM %s WHERE dir=?",odbc_table); + snprintf(sql, sizeof(sql), "SELECT msgnum FROM %s WHERE dir=? order by msgnum desc limit 1", odbc_table); + stmt = ast_odbc_prepare_and_execute(obj, generic_prepare, &gps); if (!stmt) { ast_log(AST_LOG_WARNING, "SQL Execute error!\n[%s]\n\n", sql); @@ -3283,7 +3284,12 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir) } res = SQLFetch(stmt); if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { - ast_log(AST_LOG_WARNING, "SQL Fetch error!\n[%s]\n\n", sql); + if (res == SQL_NO_DATA) { + ast_log(AST_LOG_DEBUG, "Directory '%s' has no messages and therefore no index was retrieved.\n", dir); + } else { + ast_log(AST_LOG_WARNING, "SQL Fetch error!\n[%s]\n\n", sql); + } + SQLFreeHandle (SQL_HANDLE_STMT, stmt); ast_odbc_release_obj(obj); goto yuck; @@ -3296,12 +3302,13 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir) goto yuck; } if (sscanf(rowdata, "%30d", &x) != 1) - ast_log(AST_LOG_WARNING, "Failed to read message count!\n"); + ast_log(AST_LOG_WARNING, "Failed to read message index!\n"); SQLFreeHandle (SQL_HANDLE_STMT, stmt); ast_odbc_release_obj(obj); + return x; } else ast_log(AST_LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); -yuck: +yuck: return x - 1; } @@ -3356,7 +3363,7 @@ static int message_exists(char *dir, int msgnum) ast_odbc_release_obj(obj); } else ast_log(AST_LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); -yuck: +yuck: return x; } @@ -3374,7 +3381,48 @@ yuck: */ static int count_messages(struct ast_vm_user *vmu, char *dir) { - return last_message_index(vmu, dir) + 1; + int x = 0; + int res; + SQLHSTMT stmt; + char sql[PATH_MAX]; + char rowdata[20]; + char *argv[] = { dir }; + struct generic_prepare_struct gps = { .sql = sql, .argc = 1, .argv = argv }; + + struct odbc_obj *obj; + obj = ast_odbc_request_obj(odbc_database, 0); + if (obj) { + snprintf(sql, sizeof(sql), "SELECT COUNT(*) FROM %s WHERE dir=?", odbc_table); + stmt = ast_odbc_prepare_and_execute(obj, generic_prepare, &gps); + if (!stmt) { + ast_log(AST_LOG_WARNING, "SQL Execute error!\n[%s]\n\n", sql); + ast_odbc_release_obj(obj); + goto yuck; + } + res = SQLFetch(stmt); + if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { + ast_log(AST_LOG_WARNING, "SQL Fetch error!\n[%s]\n\n", sql); + SQLFreeHandle (SQL_HANDLE_STMT, stmt); + ast_odbc_release_obj(obj); + goto yuck; + } + res = SQLGetData(stmt, 1, SQL_CHAR, rowdata, sizeof(rowdata), NULL); + if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { + ast_log(AST_LOG_WARNING, "SQL Get Data error!\n[%s]\n\n", sql); + SQLFreeHandle (SQL_HANDLE_STMT, stmt); + ast_odbc_release_obj(obj); + goto yuck; + } + if (sscanf(rowdata, "%30d", &x) != 1) + ast_log(AST_LOG_WARNING, "Failed to read message count!\n"); + SQLFreeHandle (SQL_HANDLE_STMT, stmt); + ast_odbc_release_obj(obj); + return x; + } else + ast_log(AST_LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); +yuck: + return x - 1; + } /*! @@ -3614,7 +3662,9 @@ static int store_file(const char *dir, const char *mailboxuser, const char *mail } while (0); if (obj) { ast_odbc_release_obj(obj); - } + } else + ast_log(AST_LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); +yuck: if (cfg) ast_config_destroy(cfg); if (fdm != MAP_FAILED) @@ -4885,8 +4935,12 @@ static int inboxcount2(const char *mailbox, int *urgentmsgs, int *newmsgs, int * } if (obj) { ast_odbc_release_obj(obj); - } - + *oldmsgs = atoi(rowdata); + x = 0; + } else + ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); + +yuck: return x; } @@ -5759,7 +5813,7 @@ leave_vm_out: return res; } -#if !defined(IMAP_STORAGE) && !defined(ODBC_STORAGE) +#if !defined(IMAP_STORAGE) static int resequence_mailbox(struct ast_vm_user *vmu, char *dir, int stopcount) { /* we know the actual number of messages, so stop process when number is hit */ @@ -7481,11 +7535,9 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) if (last_msg < -1) { return last_msg; -#ifndef ODBC_STORAGE } else if (vms->lastmsg != last_msg) { - ast_log(LOG_NOTICE, "Resequencing mailbox: %s, expected %d but found %d message(s) in box with max threshold of %d.\n", vms->curdir, last_msg + 1, vms->lastmsg + 1, vmu->maxmsg); - resequence_mailbox(vmu, vms->curdir, count_msg); -#endif + ast_log(LOG_NOTICE, "Resequencing Mailbox: %s, expected %d but found %d message(s) in box with max threshold of %d.\n", vms->curdir, last_msg + 1, vms->lastmsg + 1, vmu->maxmsg); + resequence_mailbox(vmu, vms->curdir, count_msg); } return 0;