X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=a88f6b585afd90e05f4afdd2de183d07f8abdc42;hb=32176e44d107d0b1edb8be10ca7e2fda4d29e3ac;hp=d546c72dfe88dfb484faa72d443037614a7498c1;hpb=3c94e0ffce0f67640094e9448fcd1d2dba6ffba4;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index d546c72..a88f6b5 100644 --- a/src/client.c +++ b/src/client.c @@ -1,4 +1,4 @@ -/* $Id: client.c,v 1.11 2007-06-15 19:35:17 adam Exp $ +/* $Id: client.c,v 1.16 2007-07-13 13:16:57 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -46,6 +46,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include #if HAVE_CONFIG_H #include "cconfig.h" @@ -107,6 +108,18 @@ static struct client *client_freelist = 0; static int send_apdu(struct client *c, Z_APDU *a) { + struct session_database *sdb = client_get_database(c); + const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG); + if (apdulog && *apdulog && *apdulog != '0') + { + ODR p = odr_createmem(ODR_PRINT); + yaz_log(YLOG_LOG, "send APDU %s", client_get_url(c)); + + odr_setprint(p, yaz_log_file()); + z_APDU(p, &a, 0, 0); + odr_setprint(p, stderr); + odr_destroy(p); + } return connection_send_apdu(client_get_connection(c), a); } @@ -137,6 +150,55 @@ void client_fatal(struct client *cl) cl->state = Client_Error; } + +static int diag_to_wrbuf(Z_DiagRec **pp, int num, WRBUF w) +{ + int code = 0; + int i; + for (i = 0; iwhich != Z_DiagRec_defaultFormat) + { + wrbuf_puts(w, "? Not in default format"); + } + else + { + Z_DefaultDiagFormat *r = p->u.defaultFormat; + + if (!r->diagnosticSetId) + wrbuf_puts(w, "? Missing diagset"); + else + { + oid_class oclass; + char diag_name_buf[OID_STR_MAX]; + const char *diag_name = 0; + diag_name = yaz_oid_to_string_buf + (r->diagnosticSetId, &oclass, diag_name_buf); + wrbuf_puts(w, diag_name); + } + if (!code) + code = *r->condition; + wrbuf_printf(w, " %d %s", *r->condition, + diagbib1_str(*r->condition)); + switch (r->which) + { + case Z_DefaultDiagFormat_v2Addinfo: + wrbuf_printf(w, " -- v2 addinfo '%s'", r->u.v2Addinfo); + break; + case Z_DefaultDiagFormat_v3Addinfo: + wrbuf_printf(w, " -- v3 addinfo '%s'", r->u.v3Addinfo); + break; + } + } + } + return code; +} + + + struct connection *client_get_connection(struct client *cl) { return cl->connection; @@ -185,7 +247,20 @@ int client_show_raw_begin(struct client *cl, int position, cl->show_raw->esn = xstrdup(esn); else cl->show_raw->esn = 0; - client_continue(cl); + + + if (cl->state == Client_Failed) + { + client_show_raw_error(cl, "client failed"); + } + else if (cl->state == Client_Disconnected) + { + client_show_raw_error(cl, "client disconnected"); + } + else + { + client_continue(cl); + } return 0; } @@ -213,26 +288,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, "Trying to present %d record(s) from %d", - 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)); @@ -245,8 +313,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; @@ -266,7 +365,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) @@ -280,13 +380,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; @@ -305,7 +403,6 @@ 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; @@ -342,13 +439,25 @@ void client_send_search(struct client *cl) if (!(piggyback = session_setting_oneval(sdb, PZ_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; @@ -392,9 +501,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 } @@ -509,19 +616,40 @@ void client_search_response(struct client *cl, Z_APDU *a) } else { /*"FAILED"*/ + Z_Records *recs = r->records; cl->hits = 0; cl->state = Client_Error; - if (r->records) { - Z_Records *recs = r->records; - if (recs->which == Z_Records_NSD) - { - yaz_log(YLOG_WARN, - "Search response: Non-surrogate diagnostic %s (%d)", - cl->database->database->url, - *recs->u.nonSurrogateDiagnostic->condition); - cl->diagnostic = *recs->u.nonSurrogateDiagnostic->condition; - cl->state = Client_Error; - } + if (recs && recs->which == Z_Records_NSD) + { + WRBUF w = wrbuf_alloc(); + + Z_DiagRec dr, *dr_p = &dr; + dr.which = Z_DiagRec_defaultFormat; + dr.u.defaultFormat = recs->u.nonSurrogateDiagnostic; + + wrbuf_printf(w, "Search response NSD %s: ", + cl->database->database->url); + + cl->diagnostic = diag_to_wrbuf(&dr_p, 1, w); + + yaz_log(YLOG_WARN, "%s", wrbuf_cstr(w)); + + cl->state = Client_Error; + wrbuf_destroy(w); + } + else if (recs && recs->which == Z_Records_multipleNSD) + { + WRBUF w = wrbuf_alloc(); + + wrbuf_printf(w, "Search response multipleNSD %s: ", + cl->database->database->url); + cl->diagnostic = + diag_to_wrbuf(recs->u.multipleNonSurDiagnostics->diagRecs, + recs->u.multipleNonSurDiagnostics->num_diagRecs, + w); + yaz_log(YLOG_WARN, "%s", wrbuf_cstr(w)); + cl->state = Client_Error; + wrbuf_destroy(w); } } } @@ -529,20 +657,43 @@ void client_search_response(struct client *cl, Z_APDU *a) void client_present_response(struct client *cl, Z_APDU *a) { Z_PresentResponse *r = a->u.presentResponse; + Z_Records *recs = r->records; + + if (recs && recs->which == Z_Records_NSD) + { + WRBUF w = wrbuf_alloc(); + + Z_DiagRec dr, *dr_p = &dr; + dr.which = Z_DiagRec_defaultFormat; + dr.u.defaultFormat = recs->u.nonSurrogateDiagnostic; + + wrbuf_printf(w, "Present response NSD %s: ", + cl->database->database->url); + + cl->diagnostic = diag_to_wrbuf(&dr_p, 1, w); + + yaz_log(YLOG_WARN, "%s", wrbuf_cstr(w)); + + cl->state = Client_Error; + wrbuf_destroy(w); - if (r->records) { - Z_Records *recs = r->records; - if (recs->which == Z_Records_NSD) - { - yaz_log(YLOG_WARN, "Non-surrogate diagnostic %s", - cl->database->database->url); - cl->diagnostic = *recs->u.nonSurrogateDiagnostic->condition; - cl->state = Client_Error; - client_show_raw_error(cl, "non surrogate diagnostics"); - } + client_show_raw_error(cl, "non surrogate diagnostics"); } - - if (!*r->presentStatus && cl->state != Client_Error) + else if (recs && recs->which == Z_Records_multipleNSD) + { + WRBUF w = wrbuf_alloc(); + + wrbuf_printf(w, "Present response multipleNSD %s: ", + cl->database->database->url); + cl->diagnostic = + diag_to_wrbuf(recs->u.multipleNonSurDiagnostics->diagRecs, + recs->u.multipleNonSurDiagnostics->num_diagRecs, + w); + yaz_log(YLOG_WARN, "%s", wrbuf_cstr(w)); + cl->state = Client_Error; + wrbuf_destroy(w); + } + else if (recs && !*r->presentStatus && cl->state != Client_Error) { yaz_log(YLOG_DEBUG, "Good Present response %s", cl->database->database->url); @@ -551,10 +702,10 @@ void client_present_response(struct client *cl, Z_APDU *a) if (cl->show_raw && cl->show_raw->active) { cl->show_raw->active = 0; // no longer active - ingest_raw_records(cl, r->records); + ingest_raw_records(cl, recs); } else - ingest_records(cl, r->records); + ingest_records(cl, recs); cl->state = Client_Idle; } else if (*r->presentStatus) @@ -653,7 +804,6 @@ void client_continue(struct client *cl) if (cl->state == Client_Connected) { client_init_request(cl); } - if (cl->state == Client_Idle) { struct session *se = client_get_session(cl);