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 maxrecs;
int startrecs;
int diagnostic;
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;
{
cl->hits = 0;
client_set_state(cl, Client_Error);
- yaz_log(YLOG_WARN, "Search error %s (%s): %s",
- error, addinfo, client_get_id(cl));
+ session_log(se, YLOG_WARN, "%s: Error %s (%s)",
+ client_get_id(cl), error, addinfo);
}
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 =
/* 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",
+ session_log(se, YLOG_LOG, "%s: postponing search: No connection",
client_get_id(cl));
client_set_state_nb(cl, Client_Working);
return -1;
link = connection_get_link(co);
assert(link);
- session_log(se, YLOG_LOG, "client %s new search", client_get_id(cl));
+ session_log(se, YLOG_LOG, "%s: new search", client_get_id(cl));
cl->diagnostic = 0;
cl->filtered = 0;
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) {
int err;
if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
- yaz_log(YLOG_LOG, "Error %s from %s",
- error, client_get_id(cl));
+ struct session *se = client_get_session(cl);
+
+ session_log(se, YLOG_WARN, "%s: Error %s (%s)",
+ client_get_id(cl), error, addinfo);
client_set_diagnostic(cl, err, error, addinfo);
client_set_state(cl, Client_Error);
}
case ZOOM_EVENT_RECV_APDU:
break;
case ZOOM_EVENT_CONNECT:
- yaz_log(YLOG_LOG, "Connected to %s", client_get_id(cl));
co->state = Conn_Open;
break;
case ZOOM_EVENT_RECV_SEARCH: