kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 05:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@62840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-05-03 00:18:05 +00:00
parent 6d9fe8c8a5
commit 2b4aac55ff
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/res_config_odbc.c
View File

@@ -421,9 +421,11 @@ static struct ast_config *config_odbc(const char *database, const char *table, c
struct ast_category *cur_cat; struct ast_category *cur_cat;
int res = 0; int res = 0;
odbc_obj *obj; odbc_obj *obj;
SQLINTEGER err=0, commented=0, cat_metric=0, var_metric=0, last_cat_metric=0; SQLINTEGER err=0, cat_metric=0, last_cat_metric=0;
SQLBIGINT id; char category[128], var_name[128], var_val[1024];
char sql[255] = "", filename[128], category[128], var_name[128], var_val[1024]; char sqlbuf[1024];
char *sql;
size_t sqlleft = sizeof(sqlbuf);
SQLSMALLINT rowcount=0; SQLSMALLINT rowcount=0;
SQLHSTMT stmt; SQLHSTMT stmt;
char last[128] = ""; char last[128] = "";
@@ -437,18 +439,16 @@ static struct ast_config *config_odbc(const char *database, const char *table, c
res = SQLAllocHandle (SQL_HANDLE_STMT, obj->con, &stmt); res = SQLAllocHandle (SQL_HANDLE_STMT, obj->con, &stmt);
SQLBindCol (stmt, 1, SQL_C_ULONG, &id, sizeof (id), &err); SQLBindCol(stmt, 1, SQL_C_ULONG, &cat_metric, sizeof(cat_metric), &err);
SQLBindCol (stmt, 2, SQL_C_ULONG, &cat_metric, sizeof (cat_metric), &err); SQLBindCol(stmt, 2, SQL_C_CHAR, &category, sizeof(category), &err);
SQLBindCol (stmt, 3, SQL_C_ULONG, &var_metric, sizeof (var_metric), &err); SQLBindCol(stmt, 3, SQL_C_CHAR, &var_name, sizeof(var_name), &err);
SQLBindCol (stmt, 4, SQL_C_ULONG, &commented, sizeof (commented), &err); SQLBindCol(stmt, 4, SQL_C_CHAR, &var_val, sizeof(var_val), &err);
SQLBindCol (stmt, 5, SQL_C_CHAR, &filename, sizeof (filename), &err);
SQLBindCol (stmt, 6, SQL_C_CHAR, &category, sizeof (category), &err);
SQLBindCol (stmt, 7, SQL_C_CHAR, &var_name, sizeof (var_name), &err);
SQLBindCol (stmt, 8, SQL_C_CHAR, &var_val, sizeof (var_val), &err);
snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE filename='%s' and commented=0 ORDER BY filename,cat_metric desc,var_metric asc,category,var_name,var_val,id", table, file); ast_build_string(&sql, &sqlleft, "SELECT cat_metric, category, var_name, var_val FROM %s ", table);
ast_build_string(&sql, &sqlleft, "WHERE filename='%s' AND commented=0 ", file);
ast_build_string(&sql, &sqlleft, "ORDER BY cat_metric DESC, var_metric ASC, category, var_name ");
res = odbc_smart_direct_execute(obj, stmt, sql); res = odbc_smart_direct_execute(obj, stmt, sqlbuf);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log (LOG_WARNING, "SQL select error!\n[%s]\n\n", sql); ast_log (LOG_WARNING, "SQL select error!\n[%s]\n\n", sql);