X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsolrtransform.c;h=d2732e52d6ceeb8fd0f9aeb80c4bf008dd713123;hp=b800ca9433efb8a12b136953b48d3932a59b8b6e;hb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35;hpb=24a717fb09063be70ff56dc82e9f03e7673254e0 diff --git a/src/solrtransform.c b/src/solrtransform.c index b800ca9..d2732e5 100644 --- a/src/solrtransform.c +++ b/src/solrtransform.c @@ -1,22 +1,14 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ - /** * \file solrtransform.c * \brief Implements SOLR transform (SOLR to RPN conversion). - * - * Evaluation order of rules: - * - * always - * relation - * structure - * position - * truncation - * index - * relationModifier */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -639,11 +631,11 @@ static int has_modifier(struct solr_node *cn, const char *name) { } -void emit_term(solr_transform_t ct, - struct solr_node *cn, - const char *term, int length, - void (*pr)(const char *buf, void *client_data), - void *client_data) +static void emit_term(solr_transform_t ct, + struct solr_node *cn, + const char *term, int length, + void (*pr)(const char *buf, void *client_data), + void *client_data) { int i; const char *ns = cn->u.st.index_uri; @@ -780,11 +772,11 @@ void emit_term(solr_transform_t ct, xfree(z3958_mem); } -void emit_terms(solr_transform_t ct, - struct solr_node *cn, - void (*pr)(const char *buf, void *client_data), - void *client_data, - const char *op) +static void emit_terms(solr_transform_t ct, + struct solr_node *cn, + void (*pr)(const char *buf, void *client_data), + void *client_data, + const char *op) { struct solr_node *ne = cn->u.st.extra_terms; if (ne) @@ -808,11 +800,11 @@ void emit_terms(solr_transform_t ct, } } -void emit_wordlist(solr_transform_t ct, - struct solr_node *cn, - void (*pr)(const char *buf, void *client_data), - void *client_data, - const char *op) +static void emit_wordlist(solr_transform_t ct, + struct solr_node *cn, + void (*pr)(const char *buf, void *client_data), + void *client_data, + const char *op) { const char *cp0 = cn->u.st.term; const char *cp1;