X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmy%2Fmy.c;h=ef11fbe74d0727c39d0d7ca0ddb3ff7cbe5e3767;hb=3b680a20ab2cbb98cfa658d85be7a44baaf95d2c;hp=7f01d7f631445d1628cd94a932897cd5425bf710;hpb=e472c0051c01cf05ba8e2fb756feccb35a198fe2;p=oweals%2Fgnunet.git diff --git a/src/my/my.c b/src/my/my.c index 7f01d7f63..ef11fbe74 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -27,7 +27,7 @@ #include #include "gnunet_my_lib.h" - +#define STRING_SIZE 50 /** * Run a prepared SELECT statement. @@ -35,7 +35,7 @@ * @param mc mysql context * @param sh handle to SELECT statment * @param params parameters to the statement - * @return + * @return #GNUNET_YES if we can prepare all statement #GNUNET_SYSERR if we can't prepare all statement */ @@ -81,6 +81,7 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc, GNUNET_MYSQL_statements_invalidate (mc); return GNUNET_SYSERR; } + } if (mysql_stmt_execute (stmt)) { @@ -91,73 +92,149 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc, GNUNET_MYSQL_statements_invalidate (mc); return GNUNET_SYSERR; } + return GNUNET_OK; } /** - * Extract results from a query result according - * to the given specification. If colums are NULL, - * the destination is not modified, and #GNUNET_NO is returned4 + * Extract results from a query result according to the given + * specification. Always fetches the next row. * * - * @param result - * @param row, the row from the result to extract - * @param result specificatio to extract for + * @param sh statement that returned results + * @param rs specification to extract for * @return - #GNUNET_YES if all results could be extracted - #GNUNET_NO if at least one result was NULL - #GNUNET_SYSERR if a result was invalid -*/ + * #GNUNET_YES if all results could be extracted + * #GNUNET_NO if there is no more data in the result set + * #GNUNET_SYSERR if a result was invalid + */ int GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, - struct GNUNET_MY_QueryParam *qp, - struct GNUNET_MY_ResultSpec *rs, - int row) + struct GNUNET_MY_ResultSpec *rs) { - MYSQL_BIND *result; + unsigned int num_fields; unsigned int i; - int had_null = GNUNET_NO; int ret; - MYSQL_STMT *stmt; stmt = GNUNET_MYSQL_statement_get_stmt (NULL /* FIXME */, sh); - // result = mysql_get_result (stmt); - result = NULL; - - if (mysql_stmt_bind_result(stmt, result)) + if (NULL == stmt) { - - GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql", - _("`%s' failed at %s:%d with error: %s\n"), + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "mysql", + ("`%s' failed at %s:%d with error: %s\n"), "mysql_stmt_bind_result", __FILE__, __LINE__, mysql_stmt_error (stmt)); - return GNUNET_SYSERR; + return GNUNET_SYSERR; } - for (i = 0 ; NULL != rs[i].conv ; i++) + num_fields = 0; + for (i=0;NULL != rs[i].pre_conv;i++) + num_fields += rs[i].num_fields; + + if (mysql_stmt_field_count (stmt) != num_fields) { - struct GNUNET_MY_ResultSpec *spec; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Number of fields missmatch between SQL result and result specification\n"); + return GNUNET_SYSERR; + } - spec = &rs[i]; - ret = spec->conv (spec->conv_cls, - spec, - result); + { + MYSQL_BIND result[num_fields]; + unsigned int field_off; - if (GNUNET_SYSERR == ret) + memset (result, 0, sizeof (MYSQL_BIND) * num_fields); + field_off = 0; + for (i=0;NULL != rs[i].pre_conv;i++) + { + struct GNUNET_MY_ResultSpec *rp = &rs[i]; + + if (GNUNET_OK != + rp->pre_conv (rp->conv_cls, + rp, + stmt, + field_off, + &result[field_off])) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Pre-conversion for MySQL result failed at offset %u\n", + i); + GNUNET_MY_cleanup_result (rs); + return GNUNET_SYSERR; + } + field_off += rp->num_fields; + } + if (mysql_stmt_bind_result (stmt, result)) { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "my", + _("`%s' failed at %s:%d with error: %s\n"), + "mysql_stmt_bind_result", __FILE__, __LINE__, + mysql_stmt_error (stmt)); return GNUNET_SYSERR; } - if (NULL != spec->result_size) - *spec->result_size = spec->dst_size; + ret = mysql_stmt_fetch (stmt); + + if (MYSQL_DATA_TRUNCATED == ret) + { + fprintf(stderr, "Data truncated with error %d \n", ret); + fprintf(stderr, "nontruncated length of the parameter values : %d\n", rs[0].mysql_bind_output_length); + return GNUNET_SYSERR; + } + + if (MYSQL_NO_DATA == ret) + return GNUNET_NO; + if (0 != ret) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "my", + _("mysql_stmt_fetch failed at %s:%d with error: %s\n"), + __FILE__, __LINE__, + mysql_stmt_error (stmt)); + return GNUNET_SYSERR; + } + field_off = 0; + for (i=0;NULL != rs[i].post_conv;i++) + { + struct GNUNET_MY_ResultSpec *rp = &rs[i]; + + if (NULL != rp->post_conv) + if (GNUNET_OK != + rp->post_conv (rp->conv_cls, + rp, + stmt, + field_off, + &result[field_off])) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Post-conversion for MySQL result failed at offset %u\n", + i); + GNUNET_MY_cleanup_result (rs); + return GNUNET_SYSERR; + } + field_off += rp->num_fields; + } } + return GNUNET_OK; +} - if (GNUNET_YES == had_null) - return GNUNET_NO; - return GNUNET_OK; +/** + * Free all memory that was allocated in @a rs during + * #GNUNET_MY_extract_result(). + * + * @param rs reult specification to clean up + */ +void +GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs) +{ + unsigned int i; + + for (i=0;NULL != rs[i].cleaner;i++) + rs[i].cleaner (rs[i].conv_cls, + &rs[i]); } + /* end of my.c */