kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-17 13:50:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix callback method to pass column count instead of the integer representation of the row we are on.

Browse Source
This commit is contained in:
Eliot Gable 2012-10-09 20:34:53 +00:00
parent ec20bc0b37
commit f66fbe2eaf
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_pgsql.c
View File

@ -623,6 +623,7 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_handle_callback_exec_detailed
} }
while (result != NULL) { while (result != NULL) {
/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Processing result with %d rows and %d columns.\n", result->rows, result->cols);*/
for (row = 0; row < result->rows; ++row) { for (row = 0; row < result->rows; ++row) {
char **names; char **names;
char **vals; char **vals;
@ -648,13 +649,16 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_handle_callback_exec_detailed
vals[col][len] = '\0'; vals[col][len] = '\0';
tmp = PQgetvalue(result->result, row, col); tmp = PQgetvalue(result->result, row, col);
strncpy(vals[col], tmp, len); strncpy(vals[col], tmp, len);
/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Processing result row %d, col %d: %s => %s\n", row, col, names[col], vals[col]);*/
} else { } else {
/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Processing result row %d, col %d.\n", row, col);*/
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "ERR: Column number %d out of range\n", col); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "ERR: Column number %d out of range\n", col);
} }
} }
if (callback(pdata, row, vals, names)) { /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing callback for row %d...\n", row);*/
break; if (callback(pdata, result->cols, vals, names)) {
goto done;
} }
for (col = 0; col < result->cols; ++col) { for (col = 0; col < result->cols; ++col) {
@ -682,6 +686,12 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_handle_callback_exec_detailed
goto error; goto error;
} }
done:
if (result) {
switch_pgsql_free_result(&result);
}
switch_pgsql_finish_results(handle);
return SWITCH_PGSQL_SUCCESS; return SWITCH_PGSQL_SUCCESS;
error: error:
#endif #endif