X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=37cef18bfc046fdf74a20ab89a297640ad32d9b4;hb=3de3ea11e6756214a2e2d1e8f3631aac10ec266c;hp=26d1f517c39ae9b0ecadd4e9e843f38e186ba456;hpb=32d55d69260109c360dd735bdc1718b3f166ff7e;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 26d1f51..37cef18 100644 --- a/src/client.c +++ b/src/client.c @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #define USE_TIMING 0 #if USE_TIMING @@ -80,6 +81,7 @@ struct client { struct connection *connection; struct session *session; char *pquery; // Current search + char *cqlquery; // used for SRU targets only int hits; int records; int setno; @@ -259,15 +261,6 @@ static void client_show_raw_error(struct client *cl, const char *addinfo) } } -static void client_show_raw_cancel(struct client *cl) -{ - while (cl->show_raw) - { - cl->show_raw->error_handler(cl->show_raw->data, "cancel"); - client_show_raw_dequeue(cl); - } -} - static void client_send_raw_present(struct client *cl) { struct session_database *sdb = client_get_database(cl); @@ -320,7 +313,6 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type) } else return -1; - yaz_log(YLOG_LOG, "Returned type %s", type); return 0; } return -1; @@ -345,70 +337,6 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec) client_show_raw_dequeue(cl); } -#ifdef RETIRED - -static void ingest_raw_records(struct client *cl, Z_Records *r) -{ - Z_NamePlusRecordList *rlist; - Z_NamePlusRecord *npr; - xmlDoc *doc; - xmlChar *buf_out; - int len_out; - if (r->which != Z_Records_DBOSD) - { - client_show_raw_error(cl, "non-surrogate diagnostics"); - return; - } - - rlist = r->u.databaseOrSurDiagnostics; - if (rlist->num_records != 1 || !rlist->records || !rlist->records[0]) - { - client_show_raw_error(cl, "no records"); - return; - } - npr = rlist->records[0]; - if (npr->which != Z_NamePlusRecord_databaseRecord) - { - client_show_raw_error(cl, "surrogate diagnostic"); - return; - } - - if (cl->show_raw && cl->show_raw->binary) - { - Z_External *rec = npr->u.databaseRecord; - if (rec->which == Z_External_octet) - { - cl->show_raw->record_handler(cl->show_raw->data, - (const char *) - rec->u.octet_aligned->buf, - rec->u.octet_aligned->len); - client_show_raw_dequeue(cl); - } - else - client_show_raw_error(cl, "no records"); - } - - doc = record_to_xml(client_get_database(cl), npr->u.databaseRecord); - if (!doc) - { - client_show_raw_error(cl, "unable to convert record to xml"); - return; - } - - xmlDocDumpMemory(doc, &buf_out, &len_out); - xmlFreeDoc(doc); - - if (cl->show_raw) - { - cl->show_raw->record_handler(cl->show_raw->data, - (const char *) buf_out, len_out); - client_show_raw_dequeue(cl); - } - xmlFree(buf_out); -} - -#endif // RETIRED show raw - void client_search_response(struct client *cl) { struct connection *co = cl->connection; @@ -451,8 +379,6 @@ void client_record_response(struct client *cl) ZOOM_record rec = 0; const char *msg, *addinfo; - yaz_log(YLOG_LOG, "show_raw=%p show_raw->active=%d", - cl->show_raw, cl->show_raw ? cl->show_raw->active : 0); if (cl->show_raw && cl->show_raw->active) { if ((rec = ZOOM_resultset_record(resultset, @@ -500,96 +426,6 @@ void client_record_response(struct client *cl) } } -#ifdef RETIRED - -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); - - client_show_raw_error(cl, "non surrogate diagnostics"); - } - 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); - - // we can mix show raw and normal show .. - if (cl->show_raw && cl->show_raw->active) - { - cl->show_raw->active = 0; // no longer active - ingest_raw_records(cl, recs); - } - else - ingest_records(cl, recs); - cl->state = Client_Continue; - } - else if (*r->presentStatus) - { - yaz_log(YLOG_WARN, "Bad Present response %s", - cl->database->database->url); - cl->state = Client_Error; - client_show_raw_error(cl, "bad present response"); - } -} - -void client_close_response(struct client *cl, Z_APDU *a) -{ - struct connection *co = cl->connection; - /* Z_Close *r = a->u.close; */ - - yaz_log(YLOG_WARN, "Close response %s", cl->database->database->url); - - cl->state = Client_Failed; - connection_destroy(co); -} - -#endif // RETIRED show raw - -#ifdef RETIRED -int client_is_our_response(struct client *cl) -{ - struct session *se = client_get_session(cl); - - if (cl && (cl->requestid == se->requestid || - cl->state == Client_Initializing)) - return 1; - return 0; -} -#endif - void client_start_search(struct client *cl) { struct session_database *sdb = client_get_database(cl); @@ -602,6 +438,7 @@ void client_start_search(struct client *cl) const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); + const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); assert(link); @@ -615,7 +452,9 @@ void client_start_search(struct client *cl) ZOOM_connection_option_set(link, "piggyback", "1"); if (*opt_queryenc) ZOOM_connection_option_set(link, "rpnCharset", opt_queryenc); - if (*opt_elements) + if (*opt_sru && *opt_elements) + ZOOM_connection_option_set(link, "schema", opt_elements); + else if (*opt_elements) ZOOM_connection_option_set(link, "elementSetName", opt_elements); if (*opt_requestsyn) ZOOM_connection_option_set(link, "preferredRecordSyntax", opt_requestsyn); @@ -627,13 +466,19 @@ void client_start_search(struct client *cl) sprintf(n, "%d", global_parameters.toget); ZOOM_connection_option_set(link, "count", n); } - if (!databaseName || !*databaseName) - databaseName = "Default"; - ZOOM_connection_option_set(link, "databaseName", databaseName); + if (databaseName) + ZOOM_connection_option_set(link, "databaseName", databaseName); ZOOM_connection_option_set(link, "presentChunk", "20"); - rs = ZOOM_connection_search_pqf(link, cl->pquery); + if (cl->cqlquery) + { + ZOOM_query q = ZOOM_query_create(); + ZOOM_query_cql(q, cl->cqlquery); + rs = ZOOM_connection_search(link, q); + } + else + rs = ZOOM_connection_search_pqf(link, cl->pquery); connection_set_resultset(co, rs); connection_continue(co); } @@ -649,6 +494,7 @@ struct client *client_create(void) else r = xmalloc(sizeof(struct client)); r->pquery = 0; + r->cqlquery = 0; r->database = 0; r->connection = 0; r->session = 0; @@ -677,6 +523,7 @@ void client_destroy(struct client *c) cc->next = c->next; } xfree(c->pquery); + xfree(c->cqlquery); if (c->connection) connection_release(c->connection); @@ -730,13 +577,38 @@ static CCL_bibset prepare_cclmap(struct client *cl) return res; } +// returns a xmalloced CQL query corresponding to the pquery in client +static char *make_cqlquery(struct client *cl) +{ + cql_transform_t cqlt = cql_transform_create(); + Z_RPNQuery *zquery; + char *r; + WRBUF wrb = wrbuf_alloc(); + int status; + + zquery = p_query_rpn(global_parameters.odr_out, cl->pquery); + if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery))) + { + yaz_log(YLOG_WARN, "failed to generate CQL query, code=%d", status); + return 0; + } + r = xstrdup(wrbuf_cstr(wrb)); + + wrbuf_destroy(wrb); + odr_reset(global_parameters.odr_out); // releases the zquery + cql_transform_close(cqlt); + return r; +} + // Parse the query given the settings specific to this client int client_parse_query(struct client *cl, const char *query) { struct session *se = client_get_session(cl); + struct session_database *sdb = client_get_database(cl); struct ccl_rpn_node *cn; int cerror, cpos; CCL_bibset ccl_map = prepare_cclmap(cl); + const char *sru = session_setting_oneval(sdb, PZ_SRU); if (!ccl_map) return -1; @@ -755,6 +627,15 @@ int client_parse_query(struct client *cl, const char *query) xfree(cl->pquery); cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf)); + xfree(cl->cqlquery); + if (*sru) + { + if (!(cl->cqlquery = make_cqlquery(cl))) + return -1; + } + else + cl->cqlquery = 0; + if (!se->relevance) { // Initialize relevance structure with query terms