diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-08 13:18:04 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-08 13:18:04 +0000 |
| commit | 98f9393f833532e1f41e957cc181aba1fc8c6b1a (patch) | |
| tree | fc31c7fc7b527a92ce66920faaaa171e735e29d5 | |
| parent | 4209b09023e68cabdfbe2ec79996524d59152f3b (diff) | |
Merge bkw_'s ODBC patch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3395 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | cdr/cdr_odbc.c | 6 | ||||
| -rwxr-xr-x | res/res_config_odbc.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index acd23270a..6cfe62211 100755 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -59,12 +59,8 @@ static int odbc_log(struct ast_cdr *cdr) char sqlcmd[2048], timestr[128]; int res = 0; struct tm tm; - struct timeval tv; - time_t t; - gettimeofday(&tv,NULL); - t = tv.tv_sec; - localtime_r(&t,&tm); + localtime_r(&cdr->start.tv_sec,&tm); ast_mutex_lock(&odbc_lock); strftime(timestr,128,DATE_FORMAT,&tm); diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index dead1233b..c836dbdcd 100755 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -111,7 +111,7 @@ static struct ast_config *config_odbc(char *file, struct ast_config *new_config_ SQLBindCol(stmt,7,SQL_C_CHAR,&var_name,sizeof(var_name),&err); SQLBindCol(stmt,8,SQL_C_CHAR,&var_val,sizeof(var_val),&err); - sprintf(sql,"select * from %s where filename='%s' and commented=0 order by filename,cat_metric,var_metric,id",table,file); + sprintf(sql,"select * from %s where filename='%s' and commented=0 order by filename,cat_metric desc,var_metric asc,id",table,file); res = SQLExecDirect(stmt,sql,SQL_NTS); if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { |