X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=63be8d4a1ba9cac8cbf696317f5972942dd69414;hb=132a4c69f5c50b8437acb8edf015c751169897be;hp=d3139a5dee993a9571e83ec8ac3049f44f663d05;hpb=a76512b8ddfe29c8b37c63ea5c1300b5a38102e4;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index d3139a5..63be8d4 100644 --- a/src/client.c +++ b/src/client.c @@ -107,6 +107,8 @@ struct client { int record_offset; int show_stat_no; 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; @@ -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); @@ -577,9 +558,9 @@ void client_search_response(struct client *cl) if (ZOOM_connection_error(link, &error, &addinfo)) { cl->hits = 0; - client_set_state(cl, Client_Error); session_log(se, YLOG_WARN, "%s: Error %s (%s)", client_get_id(cl), error, addinfo); + client_set_state(cl, Client_Error); } else { @@ -601,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); @@ -630,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); @@ -647,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 { @@ -662,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 { @@ -677,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++; @@ -707,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 { @@ -740,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++) @@ -912,22 +905,29 @@ 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); @@ -952,9 +952,6 @@ int client_start_search(struct client *cl) session_log(se, YLOG_LOG, "%s: new search", client_get_id(cl)); - cl->diagnostic = 0; - cl->filtered = 0; - client_destroy_xdoc(cl); client_init_xdoc(cl); @@ -1142,7 +1139,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 +1153,26 @@ void client_disconnect(struct client *cl) client_set_connection(cl, 0); } +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,6 +1308,31 @@ const char *client_get_facet_limit_local(struct client *cl, return 0; } +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 session_database *sdb, facet_limits_t facet_limits, WRBUF w_pqf, CCL_bibset ccl_map, @@ -1349,10 +1393,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) @@ -1666,16 +1708,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,7 +1742,7 @@ 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; @@ -1727,7 +1771,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;