[sr-dev] git:master:855c06f4: sqlops: functions to get null result value as empty or zero

Module: kamailio Branch: master Commit: 855c06f45ff69918c3e9502e7198cffc21be5cd9 URL: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 sqlops: functions to get null result value as empty or zero --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… Patch: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 7172bcc8b4..b3f21f6ff3 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -540,7 +540,8 @@ static sr_kemi_xval_t _ksr_kemi_sqlops_xval = {0}; /** * */ -static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, int col) +static sr_kemi_xval_t* ki_sqlops_result_get_mode(sip_msg_t *msg, str *resid, + int row, int col, int rmode) { sql_result_t *res = NULL; @@ -548,31 +549,31 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, if (resid == NULL || resid->s == NULL || resid->len == 0) { LM_ERR("invalid result name\n"); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } res = sql_get_result(resid); if(res==NULL) { LM_ERR("invalid result container [%.*s]\n", resid->len, resid->s); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(row >= res->nrows) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(col >= res->ncols) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_NULL) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_INT) { - _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_INT; _ksr_kemi_sqlops_xval.v.n = res->vals[row][col].value.n; return &_ksr_kemi_sqlops_xval; } @@ -581,6 +582,36 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, return &_ksr_kemi_sqlops_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_gete(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_getz(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_ZERO); +} + /** * */ @@ -626,6 +657,16 @@ static sr_kemi_t sr_kemi_sqlops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sqlops"), str_init("sql_result_gete"), + SR_KEMIP_XVAL, ki_sqlops_result_gete, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sqlops"), str_init("sql_result_getz"), + SR_KEMIP_XVAL, ki_sqlops_result_getz, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };