X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=0e7fed5eacaeb1ec00f7c007ea01cf805c98654e;hb=8552f745cef09828177a0defd7cf06d3510649c1;hp=cb5088d249e350fec4fff0ac17233acfbabee125;hpb=4dff82b21feb6db92443026561d106691ad29ee0;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index cb5088d..0e7fed5 100644 --- a/src/client.c +++ b/src/client.c @@ -51,6 +51,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #define USE_TIMING 0 #if USE_TIMING @@ -96,6 +97,7 @@ struct client { int maxrecs; int startrecs; int diagnostic; + int preferred; enum client_state state; struct show_raw *show_raw; ZOOM_resultset resultset; @@ -145,9 +147,13 @@ void client_set_state(struct client *cl, enum client_state st) 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) + yaz_log(YLOG_DEBUG, "%s: releasing watches on zero active: %d", client_get_url(cl), no_active); + if (no_active == 0) { session_alert_watch(cl->session, SESSION_WATCH_SHOW); + session_alert_watch(cl->session, SESSION_WATCH_SHOW_PREF); + } } } @@ -441,6 +447,26 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec) client_show_raw_dequeue(cl); } +void client_check_preferred_watch(struct client *cl) +{ + struct session *se = cl->session; + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: %s ", client_get_url(cl)); + if (se) + { + client_unlock(cl); + if (session_is_preferred_clients_ready(se)) { + session_alert_watch(se, SESSION_WATCH_SHOW_PREF); + } + else + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: Still locked on preferred targets."); + + client_lock(cl); + } + else + yaz_log(YLOG_WARN, "client_check_preferred_watch: %s. No session!", client_get_url(cl)); + +} + void client_search_response(struct client *cl) { struct connection *co = cl->connection; @@ -562,6 +588,7 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) 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); /* 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; @@ -618,13 +645,14 @@ void client_start_search(struct client *cl) ZOOM_connection link = connection_get_link(co); ZOOM_resultset rs; char *databaseName = sdb->database->databases[0]; - const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); - const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); - const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); - const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); - const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); - const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); - const char *opt_sort = session_setting_oneval(sdb, PZ_SORT); + const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); + const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); + const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); + const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); + const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); + const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); + const char *opt_sort = session_setting_oneval(sdb, PZ_SORT); + const char *opt_preferred = session_setting_oneval(sdb, PZ_PREFERRED); char maxrecs_str[24], startrecs_str[24]; assert(link); @@ -632,6 +660,12 @@ void client_start_search(struct client *cl) cl->hits = -1; cl->record_offset = 0; cl->diagnostic = 0; + + if (opt_preferred) { + cl->preferred = atoi(opt_preferred); + if (cl->preferred) + yaz_log(YLOG_LOG, "Target %s has preferred status: %d", sdb->database->url, cl->preferred); + } client_set_state(cl, Client_Working); if (*opt_piggyback) @@ -666,6 +700,10 @@ void client_start_search(struct client *cl) if (databaseName) ZOOM_connection_option_set(link, "databaseName", databaseName); + /* TODO Verify does it break something for CQL targets(non-SOLR) ? */ + /* facets definition is in PQF */ + client_set_facets_request(cl, link); + if (cl->cqlquery) { ZOOM_query q = ZOOM_query_create(); @@ -678,7 +716,6 @@ void client_start_search(struct client *cl) } else { - 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); } @@ -705,7 +742,7 @@ struct client *client_create(void) r->resultset = 0; r->mutex = 0; pazpar2_mutex_create(&r->mutex, "client"); - + r->preferred = 0; r->ref_count = 1; client_use(1); @@ -845,7 +882,7 @@ static char *make_cqlquery(struct client *cl) // TODO Could prob. be merge with the similar make_cqlquery static char *make_solrquery(struct client *cl) { - cql_transform_t sqlt = solr_transform_create(); + solr_transform_t sqlt = solr_transform_create(); Z_RPNQuery *zquery; char *r; WRBUF wrb = wrbuf_alloc(); @@ -865,7 +902,7 @@ static char *make_solrquery(struct client *cl) } wrbuf_destroy(wrb); odr_destroy(odr_out); - cql_transform_close(sqlt); + solr_transform_close(sqlt); return r; } @@ -926,10 +963,14 @@ int client_parse_query(struct client *cl, const char *query) xfree(cl->cqlquery); if (*sru) { - if (!strcmp(sru, "solr") - - 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; @@ -962,6 +1003,19 @@ int client_is_active(struct client *cl) return 0; } +int client_is_active_preferred(struct client *cl) +{ + /* only count if this is a preferred target. */ + if (!cl->preferred) + return 0; + /* TODO No sure this the condition that Seb wants */ + if (cl->connection && (cl->state == Client_Connecting || + cl->state == Client_Working)) + return 1; + return 0; +} + + Odr_int client_get_hits(struct client *cl) { return cl->hits; @@ -1010,6 +1064,12 @@ void client_set_startrecs(struct client *cl, int v) cl->startrecs = v; } +void client_set_preferred(struct client *cl, int v) +{ + cl->preferred = v; +} + + /* * Local variables: * c-basic-offset: 4