X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=f42ec23209c8c7718353c09736920682781b557d;hb=d7ba48e5055825167973cfa42ac76a7003f987bc;hp=6d982538966515f7bafe7ff7324520cae514d48a;hpb=ed886db22397360898fa5ef764543237e99b1774;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 6d98253..f42ec23 100644 --- a/src/client.c +++ b/src/client.c @@ -1,4 +1,4 @@ -/* $Id: client.c,v 1.13 2007-07-03 11:21:48 adam Exp $ +/* $Id: client.c,v 1.23 2007-09-20 08:13:27 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 { @@ -284,26 +295,19 @@ static void client_show_raw_cancel(struct client *cl) } } -void client_send_raw_present(struct client *cl) +static void client_present_syntax(Z_APDU *a, const char *syntax) { - Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest); - int toget = 1; - int start = cl->show_raw->position; - - assert(cl->show_raw); - - yaz_log(YLOG_DEBUG, "%s: trying to present %d record(s) from %d", - client_get_url(cl), toget, start); - - a->u.presentRequest->resultSetStartPoint = &start; - a->u.presentRequest->numberOfRecordsRequested = &toget; - - if (cl->show_raw->syntax) // syntax is optional + // empty string for syntax OMITS preferredRecordSyntax (OPTIONAL) + if (syntax && *syntax) a->u.presentRequest->preferredRecordSyntax = yaz_string_to_oid_odr(yaz_oid_std(), - CLASS_RECSYN, cl->show_raw->syntax, + CLASS_RECSYN, syntax, global_parameters.odr_out); - if (cl->show_raw->esn) // element set is optional +} + +static void client_present_elements(Z_APDU *a, const char *elements) +{ + if (elements && *elements) // element set is optional { Z_ElementSetNames *elementSetNames = odr_malloc(global_parameters.odr_out, sizeof(*elementSetNames)); @@ -316,8 +320,39 @@ void client_send_raw_present(struct client *cl) elementSetNames->which = Z_ElementSetNames_generic; elementSetNames->u.generic = - odr_strdup(global_parameters.odr_out, cl->show_raw->esn); + odr_strdup(global_parameters.odr_out, elements); } +} + +void client_send_raw_present(struct client *cl) +{ + struct session_database *sdb = client_get_database(cl); + Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest); + int toget = 1; + int start = cl->show_raw->position; + const char *syntax = 0; + const char *elements = 0; + + assert(cl->show_raw); + + yaz_log(YLOG_DEBUG, "%s: trying to present %d record(s) from %d", + client_get_url(cl), toget, start); + + a->u.presentRequest->resultSetStartPoint = &start; + a->u.presentRequest->numberOfRecordsRequested = &toget; + + if (cl->show_raw->syntax) + syntax = cl->show_raw->syntax; + else + syntax = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); + + client_present_syntax(a, syntax); + if (cl->show_raw->esn) + elements = cl->show_raw->esn; + else + elements = session_setting_oneval(sdb, PZ_ELEMENTS); + client_present_elements(a, elements); + if (send_apdu(cl, a) >= 0) { cl->show_raw->active = 1; @@ -337,7 +372,8 @@ void client_send_present(struct client *cl) Z_APDU *a = zget_APDU(global_parameters.odr_out, Z_APDU_presentRequest); int toget; int start = cl->records + 1; - char *recsyn; + const char *syntax = 0; + const char *elements = 0; toget = global_parameters.chunk; if (toget > global_parameters.toget - cl->records) @@ -351,13 +387,11 @@ void client_send_present(struct client *cl) a->u.presentRequest->resultSetStartPoint = &start; a->u.presentRequest->numberOfRecordsRequested = &toget; - if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX))) - { - a->u.presentRequest->preferredRecordSyntax = - yaz_string_to_oid_odr(yaz_oid_std(), - CLASS_RECSYN, recsyn, - global_parameters.odr_out); - } + syntax = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); + client_present_syntax(a, syntax); + + elements = session_setting_oneval(sdb, PZ_ELEMENTS); + client_present_elements(a, elements); if (send_apdu(cl, a) >= 0) cl->state = Client_Presenting; @@ -376,10 +410,8 @@ void client_send_search(struct client *cl) char **databaselist; Z_Query *zquery; int ssub = 0, lslb = 100000, mspn = 10; - char *recsyn = 0; - 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); @@ -392,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, @@ -410,16 +443,27 @@ 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') { - if ((recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX))) + const char *elements = session_setting_oneval(sdb, PZ_ELEMENTS); + const char *recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); + if (recsyn && *recsyn) { a->u.searchRequest->preferredRecordSyntax = yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, recsyn, global_parameters.odr_out); } + if (elements && *elements) + { + Z_ElementSetNames *esn = + odr_malloc(global_parameters.odr_out, sizeof(*esn)); + esn->which = Z_ElementSetNames_generic; + esn->u.generic = odr_strdup(global_parameters.odr_out, elements); + + a->u.searchRequest->smallSetElementSetNames = esn; + a->u.searchRequest->mediumSetElementSetNames = esn; + } a->u.searchRequest->smallSetUpperBound = &ssub; a->u.searchRequest->largeSetLowerBound = &lslb; a->u.searchRequest->mediumSetPresentNumber = &mspn; @@ -463,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; - } else cl->state = Client_Failed; // FIXME need to do something to the connection } @@ -546,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); @@ -569,7 +613,13 @@ 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", @@ -707,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) { @@ -716,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)); } @@ -727,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, @@ -768,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) { @@ -784,6 +834,8 @@ void client_continue(struct client *cl) cl->records < cl->hits) { client_send_present(cl); } + else + client_set_state(cl, Client_Idle); } } @@ -889,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) @@ -908,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); @@ -926,7 +980,8 @@ 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_Initializing || cl->state == Client_Searching || cl->state == Client_Presenting))