#include <yaz/diagbib1.h>
#include <yaz/snprintf.h>
#include <yaz/rpn2cql.h>
+#include <yaz/rpn2solr.h>
#define USE_TIMING 0
#if USE_TIMING
void client_set_state(struct client *cl, enum client_state st)
{
+ int was_active = 0;
+ if (client_is_active(cl))
+ was_active = 1;
cl->state = st;
- /* no need to check for all client being non-active if this one
- already is. Note that session_active_clients also LOCKS session */
- if (!client_is_active(cl) && cl->session)
+ /* If client is going from being active to inactive and all clients
+ are now idle we fire a watch for the session . The assumption is
+ that session is not mutex locked if client is already active */
+ if (was_active && !client_is_active(cl) && cl->session)
{
int no_active = session_active_clients(cl->session);
if (no_active == 0)
}
}
+/**
+ * TODO Consider thread safety!!!
+ *
+ */
+int client_report_facets(struct client *cl, ZOOM_resultset rs) {
+ int facet_idx;
+ ZOOM_facet_field *facets = ZOOM_resultset_facets(rs);
+ int facet_num;
+ struct session *se = client_get_session(cl);
+ facet_num = ZOOM_resultset_facets_size(rs);
+ yaz_log(YLOG_DEBUG, "client_report_facets: %d", facet_num);
+
+ for (facet_idx = 0; facet_idx < facet_num; facet_idx++) {
+ const char *name = ZOOM_facet_field_name(facets[facet_idx]);
+ size_t term_idx;
+ size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]);
+ for (term_idx = 0; term_idx < term_num; term_idx++ ) {
+ int freq;
+ const char *term = ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq);
+ if (term)
+ add_facet(se, name, term, freq);
+ }
+ }
+
+ return 0;
+}
+
static void ingest_raw_record(struct client *cl, ZOOM_record rec)
{
const char *buf;
struct session *se = cl->session;
ZOOM_connection link = connection_get_link(co);
ZOOM_resultset resultset = cl->resultset;
+
const char *error, *addinfo = 0;
if (ZOOM_connection_error(link, &error, &addinfo))
}
else
{
+ client_report_facets(cl, resultset);
cl->record_offset = cl->startrecs;
cl->hits = ZOOM_resultset_size(resultset);
if (se)
}
}
-static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
- int index = 0;
+static int client_set_facets_request(struct client *cl, ZOOM_connection link)
+{
struct session_database *sdb = client_get_database(cl);
const char *opt_facet_term_sort = session_setting_oneval(sdb, PZ_TERMLIST_TERM_SORT);
const char *opt_facet_term_count = session_setting_oneval(sdb, PZ_TERMLIST_TERM_COUNT);
- struct session *session = client_get_session(cl);
- struct conf_service *service = session->service;
- int num = service->num_metadata;
- WRBUF wrbuf = wrbuf_alloc();
- int first = 1;
- for (index = 0; index < num; index++) {
- struct conf_metadata *conf_meta = &service->metadata[index];
- if (conf_meta->termlist) {
- if (first)
- first = 0;
- else
- wrbuf_puts(wrbuf, ",");
- wrbuf_printf(wrbuf, "@attr 1=%s ", conf_meta->name);
-
- if (opt_facet_term_sort && opt_facet_term_sort[0] != '\0') {
- wrbuf_printf(wrbuf, " 2=%s ", opt_facet_term_sort);
- }
- if (opt_facet_term_count && opt_facet_term_count[0] != '\0') {
- wrbuf_printf(wrbuf, " 3=%s ", opt_facet_term_count);
+ /* Disable when no count is set */
+ /* TODO Verify: Do we need to reset the ZOOM facets if a ZOOM Connection is being reused??? */
+ if (opt_facet_term_count && *opt_facet_term_count)
+ {
+ int index = 0;
+ struct session *session = client_get_session(cl);
+ struct conf_service *service = session->service;
+ int num = service->num_metadata;
+ WRBUF wrbuf = wrbuf_alloc();
+ yaz_log(YLOG_DEBUG, "Facet settings, sort: %s count: %s",
+ opt_facet_term_sort, opt_facet_term_count);
+ for (index = 0; index < num; index++)
+ {
+ struct conf_metadata *conf_meta = &service->metadata[index];
+ if (conf_meta->termlist)
+ {
+ if (wrbuf_len(wrbuf))
+ wrbuf_puts(wrbuf, ", ");
+ wrbuf_printf(wrbuf, "@attr 1=%s", conf_meta->name);
+
+ if (opt_facet_term_sort && *opt_facet_term_sort)
+ wrbuf_printf(wrbuf, " @attr 2=%s", opt_facet_term_sort);
+ wrbuf_printf(wrbuf, " @attr 3=%s", opt_facet_term_count);
}
}
- }
- if (wrbuf_len(wrbuf)) {
- yaz_log(YLOG_LOG, "Setting ZOOM facets option: %s", wrbuf_cstr(wrbuf));
- ZOOM_connection_option_set(link, "facets", wrbuf_cstr(wrbuf));
- return 1;
+ if (wrbuf_len(wrbuf))
+ {
+ yaz_log(YLOG_LOG, "Setting ZOOM facets option: %s", wrbuf_cstr(wrbuf));
+ ZOOM_connection_option_set(link, "facets", wrbuf_cstr(wrbuf));
+ return 1;
+ }
}
return 0;
}
int client_has_facet(struct client *cl, const char *name) {
ZOOM_facet_field facet_field;
- if (!cl || !cl->resultset || !name)
+ if (!cl || !cl->resultset || !name) {
+ yaz_log(YLOG_DEBUG, "client has facet: Missing %p %p %s", cl, (cl ? cl->resultset: 0), name);
return 0;
+ }
facet_field = ZOOM_resultset_get_facet_field(cl->resultset, name);
- if (facet_field)
+ if (facet_field) {
+ yaz_log(YLOG_DEBUG, "client: has facets for %s", name);
return 1;
- return 0;
-}
-
-/**
- * TODO Consider thread safety!!!
- *
- */
-int client_report_facets(struct client *cl, ZOOM_resultset rs) {
- int facet_idx;
- ZOOM_facet_field *facets = ZOOM_resultset_facets(rs);
- struct session *se = client_get_session(cl);
-
- int facet_num = ZOOM_resultset_facets_size(rs);
- for (facet_idx = 0; facet_idx < facet_num; facet_idx++) {
- const char *name = ZOOM_facet_field_name(facets[facet_idx]);
- size_t term_idx;
- size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]);
- for (term_idx = 0; term_idx < term_num; term_idx++ ) {
- int freq;
- const char *term = ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq);
- if (term)
- add_facet(se, name, term, freq);
- }
}
-
+ yaz_log(YLOG_DEBUG, "client: No facets for %s", name);
return 0;
}
+
void client_start_search(struct client *cl)
{
struct session_database *sdb = client_get_database(cl);
}
else
{
- int has_facets = client_set_facets_request(cl, link);
+ client_set_facets_request(cl, link);
yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery);
rs = ZOOM_connection_search_pqf(link, cl->pquery);
- if (has_facets)
- client_report_facets(cl, rs);
}
ZOOM_resultset_destroy(cl->resultset);
cl->resultset = rs;
return r;
}
+// returns a xmalloced SOLR query corresponding to the pquery in client
+// TODO Could prob. be merge with the similar make_cqlquery
+static char *make_solrquery(struct client *cl)
+{
+ solr_transform_t sqlt = solr_transform_create();
+ Z_RPNQuery *zquery;
+ char *r;
+ WRBUF wrb = wrbuf_alloc();
+ int status;
+ ODR odr_out = odr_createmem(ODR_ENCODE);
+
+ zquery = p_query_rpn(odr_out, cl->pquery);
+ yaz_log(YLOG_LOG, "PQF: %s", cl->pquery);
+ if ((status = solr_transform_rpn2solr_wrbuf(sqlt, wrb, zquery)))
+ {
+ yaz_log(YLOG_WARN, "Failed to generate SOLR query, code=%d", status);
+ r = 0;
+ }
+ else
+ {
+ r = xstrdup(wrbuf_cstr(wrb));
+ }
+ wrbuf_destroy(wrb);
+ odr_destroy(odr_out);
+ solr_transform_close(sqlt);
+ return r;
+}
+
// Parse the query given the settings specific to this client
int client_parse_query(struct client *cl, const char *query)
{
xfree(cl->cqlquery);
if (*sru)
{
- if (!(cl->cqlquery = make_cqlquery(cl)))
- return -1;
+ if (!strcmp(sru, "solr")) {
+ if (!(cl->cqlquery = make_solrquery(cl)))
+ return -1;
+ }
+ else {
+ if (!(cl->cqlquery = make_cqlquery(cl)))
+ return -1;
+ }
}
else
cl->cqlquery = 0;