From: Stephan Bosch Date: Tue, 8 Oct 2019 16:56:55 +0000 (+0200) Subject: plugins: fts-solr: Move solr_result_get() from solr-connection.c to solr-response.c. X-Git-Tag: 2.3.10~159 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84de568222c0f264a2d6bf88d497d76d24707617;p=thirdparty%2Fdovecot%2Fcore.git plugins: fts-solr: Move solr_result_get() from solr-connection.c to solr-response.c. --- diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c index 37daa7f8c5..c9cdde746e 100644 --- a/src/plugins/fts-solr/solr-connection.c +++ b/src/plugins/fts-solr/solr-connection.c @@ -126,26 +126,6 @@ void solr_connection_deinit(struct solr_connection **_conn) i_free(conn); } -static struct solr_result * -solr_result_get(struct solr_lookup_xml_context *ctx, const char *box_id) -{ - struct solr_result *result; - char *box_id_dup; - - result = hash_table_lookup(ctx->mailboxes, box_id); - if (result != NULL) - return result; - - box_id_dup = p_strdup(ctx->result_pool, box_id); - result = p_new(ctx->result_pool, struct solr_result, 1); - result->box_id = box_id_dup; - p_array_init(&result->uids, ctx->result_pool, 32); - p_array_init(&result->scores, ctx->result_pool, 32); - hash_table_insert(ctx->mailboxes, box_id_dup, result); - array_push_back(&ctx->results, &result); - return result; -} - static int solr_lookup_add_doc(struct solr_lookup_xml_context *ctx) { struct fts_score_map *score; diff --git a/src/plugins/fts-solr/solr-response.c b/src/plugins/fts-solr/solr-response.c index 3413ee021a..da55cde26c 100644 --- a/src/plugins/fts-solr/solr-response.c +++ b/src/plugins/fts-solr/solr-response.c @@ -128,3 +128,23 @@ solr_lookup_xml_start(void *context, const char *name, const char **attrs) } } +static struct solr_result * +solr_result_get(struct solr_lookup_xml_context *ctx, const char *box_id) +{ + struct solr_result *result; + char *box_id_dup; + + result = hash_table_lookup(ctx->mailboxes, box_id); + if (result != NULL) + return result; + + box_id_dup = p_strdup(ctx->result_pool, box_id); + result = p_new(ctx->result_pool, struct solr_result, 1); + result->box_id = box_id_dup; + p_array_init(&result->uids, ctx->result_pool, 32); + p_array_init(&result->scores, ctx->result_pool, 32); + hash_table_insert(ctx->mailboxes, box_id_dup, result); + array_push_back(&ctx->results, &result); + return result; +} +