X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=02419cebafb5193a591bfc5b112c63f7cb732e43;hb=401d3364f84085a8b665a78aad7864fe5eabe095;hp=b13a28f76fd7edd249fe2dcc688d29e3e69ecee8;hpb=941107ab62dc3972a050c569b7b4e657dcc582a5;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index b13a28f..02419ce 100644 --- a/src/client.c +++ b/src/client.c @@ -1,4 +1,4 @@ -/* $Id: client.c,v 1.14 2007-07-05 18:40:24 adam Exp $ +/* $Id: client.c,v 1.25 2007-09-20 09:22:37 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -101,7 +101,8 @@ static const char *client_states[] = { "Client_Error", "Client_Failed", "Client_Disconnected", - "Client_Stopped" + "Client_Stopped", + "Client_Continue" }; static struct client *client_freelist = 0; @@ -137,6 +138,12 @@ enum client_state client_get_state(struct client *cl) void client_set_state(struct client *cl, enum client_state st) { cl->state = st; + if (cl->session) + { + int no_active = session_active_clients(cl->session); + if (no_active == 0) + session_alert_watch(cl->session, SESSION_WATCH_SHOW); + } } static void client_show_raw_error(struct client *cl, const char *addinfo); @@ -147,7 +154,7 @@ void client_fatal(struct client *cl) client_show_raw_error(cl, "client connection failure"); yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl)); connection_destroy(cl->connection); - cl->state = Client_Error; + client_set_state(cl, Client_Error); } @@ -249,9 +256,13 @@ int client_show_raw_begin(struct client *cl, int position, cl->show_raw->esn = 0; - if (cl->state == Client_Failed || cl->state == Client_Disconnected) + if (cl->state == Client_Failed) + { + client_show_raw_error(cl, "client failed"); + } + else if (cl->state == Client_Disconnected) { - client_show_raw_error(cl, "not connected"); + client_show_raw_error(cl, "client disconnected"); } else { @@ -399,9 +410,8 @@ void client_send_search(struct client *cl) char **databaselist; Z_Query *zquery; int ssub = 0, lslb = 100000, mspn = 10; - char *piggyback = 0; - char *queryenc = 0; - yaz_iconv_t iconv = 0; + const char *piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); + const char *queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); yaz_log(YLOG_DEBUG, "Sending search to %s", sdb->database->url); @@ -414,8 +424,9 @@ void client_send_search(struct client *cl) client_get_pquery(cl)); // converting to target encoding - if ((queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING))){ - iconv = yaz_iconv_open(queryenc, "UTF-8"); + if (queryenc && *queryenc) + { + yaz_iconv_t iconv = yaz_iconv_open(queryenc, "UTF-8"); if (iconv){ yaz_query_charset_convert_rpnquery(zquery->u.type_1, global_parameters.odr_out, @@ -432,8 +443,7 @@ void client_send_search(struct client *cl) for (ndb = 0; sdb->database->databases[ndb]; ndb++) databaselist[ndb] = sdb->database->databases[ndb]; - if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK)) - || *piggyback == '1') + if (!piggyback || *piggyback == '1') { const char *elements = session_setting_oneval(sdb, PZ_ELEMENTS); const char *recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); @@ -497,9 +507,7 @@ void client_init_response(struct client *cl, Z_APDU *a) yaz_log(YLOG_DEBUG, "Init response %s", cl->database->database->url); if (*r->result) - { - cl->state = Client_Idle; - } + cl->state = Client_Continue; else cl->state = Client_Failed; // FIXME need to do something to the connection } @@ -580,7 +588,9 @@ static void ingest_records(struct client *cl, Z_Records *r) continue; } if (rlist->num_records) - session_alert_watch(s, SESSION_WATCH_RECORDS); + session_alert_watch(s, SESSION_WATCH_SHOW); + if (rlist->num_records) + session_alert_watch(s, SESSION_WATCH_RECORD); #if USE_TIMING yaz_timing_stop(t); @@ -603,14 +613,20 @@ void client_search_response(struct client *cl, Z_APDU *a) if (*r->searchStatus) { cl->hits = *r->resultCount; - se->total_hits += cl->hits; + if (cl->hits < 0) + { + yaz_log(YLOG_WARN, "Target %s returns hit count %d", + cl->database->database->url, cl->hits); + } + else + se->total_hits += cl->hits; if (r->presentStatus && !*r->presentStatus && r->records) { yaz_log(YLOG_DEBUG, "Records in search response %s", cl->database->database->url); ingest_records(cl, r->records); } - cl->state = Client_Idle; + cl->state = Client_Continue; } else { /*"FAILED"*/ @@ -704,7 +720,7 @@ void client_present_response(struct client *cl, Z_APDU *a) } else ingest_records(cl, recs); - cl->state = Client_Idle; + cl->state = Client_Continue; } else if (*r->presentStatus) { @@ -741,7 +757,7 @@ int client_is_our_response(struct client *cl) static void init_authentication(struct client *cl, Z_InitRequest *req) { struct session_database *sdb = client_get_database(cl); - char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION); + const char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION); if (*auth) { @@ -750,7 +766,7 @@ static void init_authentication(struct client *cl, Z_InitRequest *req) Z_IdAuthentication *idAuth = odr_malloc(global_parameters.odr_out, sizeof(*idAuth)); idAuth->which = Z_IdAuthentication_open; - idAuth->u.open = auth; + idAuth->u.open = odr_strdup(global_parameters.odr_out, auth); req->idAuthentication = idAuth; connection_set_authentication(co, nmem_strdup(se->session_nmem, auth)); } @@ -761,8 +777,8 @@ static void init_zproxy(struct client *cl, Z_InitRequest *req) struct session_database *sdb = client_get_database(cl); char *ztarget = sdb->database->url; //char *ztarget = sdb->url; - char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); - + const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); + if (*zproxy) yaz_oi_set_string_oid(&req->otherInfo, global_parameters.odr_out, @@ -802,7 +818,7 @@ void client_continue(struct client *cl) if (cl->state == Client_Connected) { client_init_request(cl); } - if (cl->state == Client_Idle) + if (cl->state == Client_Continue || cl->state == Client_Idle) { struct session *se = client_get_session(cl); if (cl->requestid != se->requestid && cl->pquery) { @@ -818,6 +834,8 @@ void client_continue(struct client *cl) cl->records < cl->hits) { client_send_present(cl); } + else + client_set_state(cl, Client_Idle); } } @@ -923,6 +941,7 @@ int client_parse_query(struct client *cl, const char *query) if (!ccl_map) return -1; + cn = ccl_find_str(ccl_map, query, &cerror, &cpos); ccl_qual_rm(&ccl_map); if (!cn) @@ -942,9 +961,10 @@ int client_parse_query(struct client *cl, const char *query) // Initialize relevance structure with query terms char *p[512]; extract_terms(se->nmem, cn, p); - se->relevance = relevance_create(client_get_database(cl)->pct, - se->nmem, (const char **) p, - se->expected_maxrecs); + se->relevance = relevance_create( + global_parameters.server->relevance_pct, + se->nmem, (const char **) p, + se->expected_maxrecs); } ccl_rpn_delete(cn); @@ -960,7 +980,9 @@ void client_set_session(struct client *cl, struct session *se) int client_is_active(struct client *cl) { - if (cl->connection && (cl->state == Client_Connecting || + if (cl->connection && (cl->state == Client_Continue || + cl->state == Client_Connecting || + cl->state == Client_Connected || cl->state == Client_Initializing || cl->state == Client_Searching || cl->state == Client_Presenting))