X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=blobdiff_plain;f=src%2Fclient.c;h=31c1745870d1f5e64a637ec35b0302da80dfde23;hp=2bb56f023ee9ddda751c6239818206dce7ad15ea;hb=HEAD;hpb=c0ac28d0c3a5f952ff312db4c84fa056b246686a diff --git a/src/client.c b/src/client.c index 2bb56f0..31c1745 100644 --- a/src/client.c +++ b/src/client.c @@ -90,7 +90,7 @@ static int client_use(int delta) return clients; } -int clients_count(void) +int clients_get_count(void) { return client_use(0); } @@ -106,7 +106,9 @@ struct client { Odr_int hits; int record_offset; int show_stat_no; - int filtered; // When using local:, this will count the number of filtered records. + int filtered; /* number of records ignored for local filtering */ + int ingest_failures; /* number of records where XSLT/other failed */ + int record_failures; /* number of records where ZOOM reported error */ int maxrecs; int startrecs; int diagnostic; @@ -519,7 +521,7 @@ static void client_report_facets(struct client *cl, ZOOM_resultset rs) ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq); if (term) - add_facet(se, p, term, freq); + add_facet(se, p, term, freq, cl); } break; } @@ -541,27 +543,6 @@ 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_id(cl)); - if (se) - { - client_unlock(cl); - /* TODO possible threading issue. Session can have been destroyed */ - 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_id(cl)); - -} - struct suggestions* client_suggestions_create(const char* suggestions_string); static void client_suggestions_destroy(struct client *cl); @@ -570,23 +551,24 @@ void client_search_response(struct client *cl) struct connection *co = cl->connection; ZOOM_connection link = connection_get_link(co); ZOOM_resultset resultset = cl->resultset; + struct session *se = client_get_session(cl); const char *error, *addinfo = 0; if (ZOOM_connection_error(link, &error, &addinfo)) { cl->hits = 0; + session_log(se, YLOG_WARN, "%s: Error %s (%s)", + client_get_id(cl), error, addinfo); client_set_state(cl, Client_Error); - yaz_log(YLOG_WARN, "Search error %s (%s): %s", - error, addinfo, client_get_id(cl)); } else { client_report_facets(cl, resultset); cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); - yaz_log(YLOG_DEBUG, "client_search_response: hits " ODR_INT_PRINTF, - cl->hits); + session_log(se, YLOG_LOG, "%s: hits: " ODR_INT_PRINTF, + client_get_id(cl), cl->hits); if (cl->suggestions) client_suggestions_destroy(cl); cl->suggestions = @@ -600,6 +582,11 @@ void client_got_records(struct client *cl) struct session *se = cl->session; if (se) { + client_unlock(cl); + /* TODO possible threading issue. Session can have been destroyed */ + if (session_is_preferred_clients_ready(se)) + session_alert_watch(se, SESSION_WATCH_SHOW_PREF); + client_lock(cl); if (reclist_get_num_records(se->reclist) > 0) { client_unlock(cl); @@ -629,9 +616,12 @@ static void client_record_ingest(struct client *cl) NMEM nmem = nmem_create(); int rc = ingest_xml_record(cl, xdoc, offset, nmem, 1); if (rc == -1) + { session_log(se, YLOG_WARN, - "Failed to ingest xdoc from %s #%d", + "%s: #%d: failed to ingest xdoc", client_get_id(cl), offset); + cl->ingest_failures++; + } else if (rc == -2) cl->filtered++; nmem_destroy(nmem); @@ -646,6 +636,7 @@ static void client_record_ingest(struct client *cl) { session_log(se, YLOG_WARN, "Record error %s (%s): %s #%d", msg, addinfo, client_get_id(cl), offset); + cl->record_failures++; } else { @@ -661,12 +652,13 @@ static void client_record_ingest(struct client *cl) if (!xmlrec) { const char *rec_syn = ZOOM_record_get(rec, "syntax", NULL); - session_log(se, YLOG_WARN, "ZOOM_record_get failed from %s #%d", + session_log(se, YLOG_WARN, "%s: #%d: ZOOM_record_get failed", client_get_id(cl), offset); session_log(se, YLOG_LOG, "pz:nativesyntax=%s . " "ZOOM record type=%s . Actual record syntax=%s", s ? s : "null", type, rec_syn ? rec_syn : "null"); + cl->ingest_failures++; } else { @@ -676,12 +668,13 @@ static void client_record_ingest(struct client *cl) { const char *rec_syn = ZOOM_record_get(rec, "syntax", NULL); session_log(se, YLOG_WARN, - "Failed to ingest record from %s #%d", + "%s: #%d: failed to ingest record", client_get_id(cl), offset); session_log(se, YLOG_LOG, "pz:nativesyntax=%s . " "ZOOM record type=%s . Actual record syntax=%s", s ? s : "null", type, rec_syn ? rec_syn : "null"); + cl->ingest_failures++; } else if (rc == -2) cl->filtered++; @@ -706,9 +699,10 @@ void client_record_response(struct client *cl, int *got_records) if (ZOOM_connection_error(link, &error, &addinfo)) { + struct session *se = client_get_session(cl); + session_log(se, YLOG_WARN, "%s: Error %s (%s)", + client_get_id(cl), error, addinfo); client_set_state(cl, Client_Error); - yaz_log(YLOG_WARN, "Search error %s (%s): %s", - error, addinfo, client_get_id(cl)); } else { @@ -739,7 +733,7 @@ int client_reingest(struct client *cl) { int i = cl->startrecs; int to = cl->record_offset; - cl->filtered = 0; + cl->record_failures = cl->ingest_failures = cl->filtered = 0; cl->record_offset = i; for (; i < to; i++) @@ -784,6 +778,8 @@ int client_has_facet(struct client *cl, const char *name) for (s = sdb->settings[PZ_FACETMAP]; s; s = s->next) { const char *p = strchr(s->name + 3, ':'); + if ( !strncmp(p, ":split:", 7) ) + p += 6; // PAZ-1009 if (p && !strcmp(name, p + 1)) return 1; } @@ -829,6 +825,7 @@ int client_fetch_more(struct client *cl) const char *str; int extend_recs = 0; int number = cl->hits - cl->record_offset; + struct connection *co = client_get_connection(cl); str = session_setting_oneval(sdb, PZ_EXTENDRECS); if (!str || !*str) @@ -836,18 +833,21 @@ int client_fetch_more(struct client *cl) extend_recs = atoi(str); - yaz_log(YLOG_LOG, "cl=%s show_stat_no=%d got=%d", + yaz_log(YLOG_DEBUG, "cl=%s show_stat_no=%d got=%d", client_get_id(cl), cl->show_stat_no, cl->record_offset); if (cl->show_stat_no < cl->record_offset) return 0; - yaz_log(YLOG_LOG, "cl=%s Trying to fetch more", client_get_id(cl)); + yaz_log(YLOG_DEBUG, "cl=%s Trying to fetch more", client_get_id(cl)); if (number > extend_recs) number = extend_recs; - if (number > 0) + if (number <= 0) + yaz_log(YLOG_DEBUG, "cl=%s. OK no more in total set", client_get_id(cl)); + else if (!co) + yaz_log(YLOG_DEBUG, "cl=%s. No connection", client_get_id(cl)); + else { ZOOM_resultset set = cl->resultset; - struct connection *co = client_get_connection(cl); str = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); ZOOM_resultset_option_set(set, "preferredRecordSyntax", str); @@ -860,10 +860,6 @@ int client_fetch_more(struct client *cl) connection_continue(co); return 1; } - else - { - yaz_log(YLOG_LOG, "cl=%s. OK no more in total set", client_get_id(cl)); - } return 0; } @@ -894,6 +890,22 @@ int client_parse_range(struct client *cl, const char *startrecs, return 0; } +const char *client_get_query(struct client *cl, const char **type, NMEM nmem) +{ + if (cl->pquery) + { + *type = "pqf"; + return nmem_strdup(nmem, cl->pquery); + } + if (cl->cqlquery) + { + *type = "cql"; + return nmem_strdup(nmem, cl->cqlquery); + } + *type = 0; + return 0; +} + int client_start_search(struct client *cl) { struct session_database *sdb = client_get_database(cl); @@ -911,37 +923,45 @@ int client_start_search(struct client *cl) const char *opt_preferred = session_setting_oneval(sdb, PZ_PREFERRED); const char *extra_args = session_setting_oneval(sdb, PZ_EXTRA_ARGS); const char *opt_present_chunk = session_setting_oneval(sdb, PZ_PRESENT_CHUNK); + const char *opt_timeout = session_setting_oneval(sdb, PZ_TIMEOUT); ZOOM_query query; char maxrecs_str[24], startrecs_str[24], present_chunk_str[24]; struct timeval tval; int present_chunk = 20; // Default chunk size int rc_prep_connection; + int operation_timeout = se->service->z3950_operation_timeout; + cl->diagnostic = 0; + cl->record_failures = cl->ingest_failures = cl->filtered = 0; yaz_gettimeofday(&tval); tval.tv_sec += 5; + if (opt_timeout && *opt_timeout) + operation_timeout = atoi(opt_timeout); + if (opt_present_chunk && strcmp(opt_present_chunk,"")) { present_chunk = atoi(opt_present_chunk); yaz_log(YLOG_DEBUG, "Present chunk set to %d", present_chunk); } rc_prep_connection = - client_prep_connection(cl, se->service->z3950_operation_timeout, + client_prep_connection(cl, operation_timeout, se->service->z3950_session_timeout, se->service->server->iochan_man, &tval); /* Nothing has changed and we already have a result */ if (cl->same_search == 1 && rc_prep_connection == 2) { - session_log(se, YLOG_LOG, "client %s resuse result", client_get_id(cl)); + session_log(se, YLOG_LOG, "%s: reuse result", client_get_id(cl)); client_report_facets(cl, cl->resultset); return client_reingest(cl); } else if (!rc_prep_connection) { - session_log(se, YLOG_LOG, "client %s postponing search: No connection", - client_get_id(cl)); - client_set_state_nb(cl, Client_Working); + client_set_diagnostic(cl, 2, + ZOOM_diag_str(2), + "Cannot create connection"); + client_set_state_nb(cl, Client_Error); return -1; } co = client_get_connection(cl); @@ -949,11 +969,6 @@ int client_start_search(struct client *cl) link = connection_get_link(co); assert(link); - session_log(se, YLOG_LOG, "client %s new search", client_get_id(cl)); - - cl->diagnostic = 0; - cl->filtered = 0; - client_destroy_xdoc(cl); client_init_xdoc(cl); @@ -1009,17 +1024,16 @@ int client_start_search(struct client *cl) query = ZOOM_query_create(); if (cl->cqlquery) { - yaz_log(YLOG_LOG, "Client %s: Search CQL: %s", client_get_id(cl), - cl->cqlquery); + session_log(se, YLOG_LOG, "%s: Search CQL: %s", client_get_id(cl), + cl->cqlquery); ZOOM_query_cql(query, cl->cqlquery); if (*opt_sort) ZOOM_query_sortby(query, opt_sort); } else { - yaz_log(YLOG_LOG, "Client %s: Search PQF: %s", client_get_id(cl), - cl->pquery); - + session_log(se, YLOG_LOG, "%s: Search PQF: %s", client_get_id(cl), + cl->pquery); ZOOM_query_prefix(query, cl->pquery); } if (cl->sort_strategy && cl->sort_criteria) { @@ -1142,7 +1156,9 @@ void client_set_connection(struct client *cl, struct connection *con) } else { + client_lock(cl); cl->connection = con; + client_unlock(cl); client_destroy(cl); } } @@ -1154,6 +1170,32 @@ void client_disconnect(struct client *cl) client_set_connection(cl, 0); } +void client_mark_dead(struct client *cl) +{ + if (cl->connection) + connection_mark_dead(cl->connection); +} + +void client_stop(struct client *cl) +{ + client_lock(cl); + if (cl->state == Client_Working || cl->state == Client_Connecting) + { + yaz_log(YLOG_LOG, "client_stop: %s release", client_get_id(cl)); + if (cl->connection) + { + connection_release2(cl->connection); + assert(cl->ref_count > 1); + cl->ref_count--; + cl->connection = 0; + } + cl->state = Client_Disconnected; + } + else + yaz_log(YLOG_LOG, "client_stop: %s ignore", client_get_id(cl)); + client_unlock(cl); +} + // Initialize CCL map for a target static CCL_bibset prepare_cclmap(struct client *cl, CCL_bibset base_bibset) { @@ -1289,7 +1331,32 @@ const char *client_get_facet_limit_local(struct client *cl, return 0; } -static int apply_limit(struct session_database *sdb, +static void ccl_quote_map_term(CCL_bibset ccl_map, WRBUF w, + const char *term) +{ + int quote_it = 0; + const char *cp; + for (cp = term; *cp; cp++) + if ((*cp >= '0' && *cp <= '9') || strchr(" +-", *cp)) + ; + else + quote_it = 1; + if (!quote_it) + wrbuf_puts(w, term); + else + { + wrbuf_putc(w, '\"'); + for (cp = term; *cp; cp++) + { + if (strchr( "\\\"", *cp)) + wrbuf_putc(w, '\\'); + wrbuf_putc(w, *cp); + } + wrbuf_putc(w, '\"'); + } +} + +static int apply_limit(struct client *cl, facet_limits_t facet_limits, WRBUF w_pqf, CCL_bibset ccl_map, struct conf_service *service) @@ -1298,6 +1365,7 @@ static int apply_limit(struct session_database *sdb, int i = 0; const char *name; const char *value; + struct session_database *sdb = client_get_database(cl); NMEM nmem_tmp = nmem_create(); for (i = 0; (name = facet_limits_get(facet_limits, i, &value)); i++) @@ -1317,6 +1385,28 @@ static int apply_limit(struct session_database *sdb, nmem_strsplit_escape2(nmem_tmp, "|", value, &values, &num, 1, '\\', 1); + for (i = 0; i < num; i++) + { + const char *id = session_lookup_id_facet(cl->session, + cl, name, + values[i]); + if (id) + { + if ( *id ) + { + values[i] = nmem_strdup(nmem_tmp, id); + yaz_log(YLOG_DEBUG, + "apply_limit: s='%s' found id '%s'",s->name,id ); + } + else + { + yaz_log(YLOG_DEBUG, + "apply_limit: %s: term '%s' not found, failing client", + s->name, values[i] ); + ret = -1; + } + } + } nmem_strsplit_escape2(nmem_tmp, ",", s->value, &cvalues, &cnum, 1, '\\', 1); @@ -1349,10 +1439,8 @@ static int apply_limit(struct session_database *sdb, struct ccl_rpn_node *cn; wrbuf_rewind(ccl_w); wrbuf_puts(ccl_w, ccl); - wrbuf_puts(ccl_w, "=\""); - wrbuf_puts(ccl_w, values[i]); - wrbuf_puts(ccl_w, "\""); - + wrbuf_putc(ccl_w, '='); + ccl_quote_map_term(ccl_map, ccl_w, values[i]); cn = ccl_find_str(ccl_map, wrbuf_cstr(ccl_w), &cerror, &cpos); if (cn) @@ -1435,6 +1523,9 @@ int client_parse_query(struct client *cl, const char *query, if (!ccl_map) return -3; + xfree(cl->cqlquery); + cl->cqlquery = 0; + w_ccl = wrbuf_alloc(); wrbuf_puts(w_ccl, query); @@ -1445,17 +1536,23 @@ int client_parse_query(struct client *cl, const char *query, wrbuf_puts(w_pqf, " "); } - if (apply_limit(sdb, facet_limits, w_pqf, ccl_map, service)) + if (apply_limit(cl, facet_limits, w_pqf, ccl_map, service)) { + client_set_state(cl, Client_Error); ccl_qual_rm(&ccl_map); + + wrbuf_destroy(w_ccl); + wrbuf_destroy(w_pqf); + + xfree(cl->pquery); + cl->pquery = 0; + return -2; } facet_limits_destroy(cl->facet_limits); cl->facet_limits = facet_limits_dup(facet_limits); - yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s", - client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf)); cn = ccl_find_str(ccl_map, wrbuf_cstr(w_ccl), &cerror, &cpos); ccl_qual_rm(&ccl_map); if (!cn) @@ -1468,6 +1565,10 @@ int client_parse_query(struct client *cl, const char *query, wrbuf_cstr(w_ccl)); wrbuf_destroy(w_ccl); wrbuf_destroy(w_pqf); + + xfree(cl->pquery); + cl->pquery = 0; + return -1; } wrbuf_destroy(w_ccl); @@ -1498,7 +1599,7 @@ int client_parse_query(struct client *cl, const char *query, { if (cl->pquery) session_log(se, YLOG_LOG, "Client %s: " - "Re-search due query/limit change: %s to %s", + "Re-search due query/limit change: %s to %s", client_get_id(cl), cl->pquery, wrbuf_cstr(w_pqf)); xfree(cl->pquery); cl->pquery = xstrdup(wrbuf_cstr(w_pqf)); @@ -1509,14 +1610,10 @@ int client_parse_query(struct client *cl, const char *query, } wrbuf_destroy(w_pqf); - xfree(cl->cqlquery); - cl->cqlquery = 0; - odr_out = odr_createmem(ODR_ENCODE); zquery = p_query_rpn(odr_out, cl->pquery); if (!zquery) { - session_log(se, YLOG_WARN, "Invalid PQF query for Client %s: %s", client_get_id(cl), cl->pquery); ret_value = -1; @@ -1524,9 +1621,6 @@ int client_parse_query(struct client *cl, const char *query, } else { - session_log(se, YLOG_LOG, "PQF for Client %s: %s", - client_get_id(cl), cl->pquery); - /* Support for PQF on SRU targets. */ if (strcmp(query_syntax, "pqf") != 0 && *sru) { @@ -1560,8 +1654,11 @@ int client_parse_query(struct client *cl, const char *query, return ret_value; } -int client_parse_sort(struct client *cl, struct reclist_sortparms *sp) +int client_parse_sort(struct client *cl, struct reclist_sortparms *sp, + int *has_sortmap) { + if (has_sortmap) + *has_sortmap = 0; if (sp) { const char *sort_strategy_and_spec = @@ -1597,6 +1694,8 @@ int client_parse_sort(struct client *cl, struct reclist_sortparms *sp) xfree(cl->sort_criteria); cl->sort_criteria = xstrdup(p); } + if (has_sortmap) + (*has_sortmap)++; } else { yaz_log(YLOG_LOG, "Client %s: " @@ -1666,16 +1765,18 @@ Odr_int client_get_approximation(struct client *cl) return cl->hits; } -int client_get_num_records(struct client *cl) +int client_get_num_records(struct client *cl, int *filtered, int *ingest, + int *failed) { + if (filtered) + *filtered = cl->filtered; + if (ingest) + *ingest = cl->ingest_failures; + if (failed) + *failed = cl->record_failures; return cl->record_offset; } -int client_get_num_records_filtered(struct client *cl) -{ - return cl->filtered; -} - void client_set_diagnostic(struct client *cl, int diagnostic, const char *message, const char *addinfo) { @@ -1698,12 +1799,12 @@ int client_get_diagnostic(struct client *cl, const char **message, return cl->diagnostic; } -const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf) +const char *client_get_suggestions_xml(struct client *cl, WRBUF wrbuf) { /* int idx; */ struct suggestions *suggestions = cl->suggestions; - if (!suggestions) + if (!suggestions) return ""; if (suggestions->passthrough) { @@ -1727,7 +1828,6 @@ const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf) return wrbuf_cstr(wrbuf); } - void client_set_database(struct client *cl, struct session_database *db) { cl->database = db;