X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-sru.c;h=f688749e3c2e86de8955b769b78a39efc8a7d95d;hp=144f025159b894289914c2c852a77cffe6439b6b;hb=eeb3f9f3eb2b41f75341f5d93d0583bda80e5a07;hpb=2ad2651374674c895ad59b267da6fe2d8665fabd diff --git a/src/zoom-sru.c b/src/zoom-sru.c index 144f025..f688749 100644 --- a/src/zoom-sru.c +++ b/src/zoom-sru.c @@ -1,11 +1,14 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ /** * \file zoom-sru.c * \brief Implements ZOOM SRU */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -13,6 +16,7 @@ #include "zoom-p.h" #include +#include #if YAZ_HAVE_XML2 static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d) @@ -28,14 +32,11 @@ static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d) static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr) { Z_GDU *gdu; - ZOOM_Event event; const char *database = ZOOM_options_get(c->options, "databaseName"); - char *fdatabase = 0; - - if (database) - fdatabase = yaz_encode_sru_dbpath_odr(c->odr_out, database); - gdu = z_get_HTTP_Request_host_path(c->odr_out, c->host_port, - fdatabase ? fdatabase : c->path); + + gdu = z_get_HTTP_Request_uri(c->odr_out, c->host_port, + database, + c->proxy ? 1 : 0); if (c->sru_mode == zoom_sru_get) { @@ -51,18 +52,9 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr) } else if (c->sru_mode == zoom_sru_solr) { - yaz_solr_encode(gdu->u.HTTP_Request, sr, c->odr_out, c->charset); + yaz_solr_encode_request(gdu->u.HTTP_Request, sr, c->odr_out, c->charset); } - if (!z_GDU(c->odr_out, &gdu, 0, 0)) - return zoom_complete; - if (c->odr_print) - z_GDU(c->odr_print, &gdu, 0, 0); - c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0); - - event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU); - ZOOM_connection_put_event(c, event); - odr_reset(c->odr_out); - return ZOOM_send_buf(c); + return ZOOM_send_GDU(c, gdu); } #endif @@ -70,8 +62,29 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr) static Z_SRW_PDU *ZOOM_srw_get_pdu(ZOOM_connection c, int type) { Z_SRW_PDU *sr = yaz_srw_get_pdu(c->odr_out, type, c->sru_version); - sr->username = c->user; - sr->password = c->password; + if (c->url_authentication && c->user) + { + Z_SRW_extra_arg **ea = &sr->extra_args; + while (*ea) + ea = &(*ea)->next; + *ea = (Z_SRW_extra_arg *) odr_malloc(c->odr_out, sizeof(**ea)); + (*ea)->name = "x-username"; + (*ea)->value = c->user; + ea = &(*ea)->next; + if (c->password) + { + *ea = (Z_SRW_extra_arg *) odr_malloc(c->odr_out, sizeof(**ea)); + (*ea)->name = "x-password"; + (*ea)->value = c->password; + ea = &(*ea)->next; + } + *ea = 0; + } + else + { + sr->username = c->user; + sr->password = c->password; + } return sr; } #endif @@ -88,23 +101,23 @@ zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c) return zoom_complete; assert (c->tasks->which == ZOOM_TASK_SCAN); scan = c->tasks->u.scan.scan; - + sr = ZOOM_srw_get_pdu(c, Z_SRW_scan_request); z_query = ZOOM_query_get_Z_Query(scan->query); /* SRU scan can only carry CQL and PQF */ if (z_query->which == Z_Query_type_104) { - sr->u.scan_request->query_type = Z_SRW_query_type_cql; - sr->u.scan_request->scanClause.cql = - ZOOM_query_get_query_string(scan->query); + sr->u.scan_request->queryType = "cql"; + sr->u.scan_request->scanClause = + odr_strdup(c->odr_out, ZOOM_query_get_query_string(scan->query)); } else if (z_query->which == Z_Query_type_1 || z_query->which == Z_Query_type_101) { - sr->u.scan_request->query_type = Z_SRW_query_type_pqf; - sr->u.scan_request->scanClause.pqf = - ZOOM_query_get_query_string(scan->query); + sr->u.scan_request->queryType = "pqf"; + sr->u.scan_request->scanClause = + odr_strdup(c->odr_out, ZOOM_query_get_query_string(scan->query)); } else { @@ -114,10 +127,10 @@ zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c) sr->u.scan_request->maximumTerms = odr_intdup( c->odr_out, ZOOM_options_get_int(scan->options, "number", 10)); - + sr->u.scan_request->responsePosition = odr_intdup( c->odr_out, ZOOM_options_get_int(scan->options, "position", 1)); - + option_val = ZOOM_options_get(scan->options, "extraArgs"); yaz_encode_sru_extra(sr, c->odr_out, option_val); return send_srw(c, sr); @@ -132,13 +145,15 @@ zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c) #if YAZ_HAVE_XML2 zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) { + const char *facets = 0; int i; int *start, *count; ZOOM_resultset resultset = 0; Z_SRW_PDU *sr = 0; const char *option_val = 0; + const char *schema = 0; Z_Query *z_query; - + Z_FacetList *facet_list = 0; if (c->error) /* don't continue on error */ return zoom_complete; assert(c->tasks); @@ -151,9 +166,14 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) ZOOM_options_set(resultset->options, "setname", resultset->setname); start = &c->tasks->u.search.start; count = &c->tasks->u.search.count; + facets = ZOOM_options_get(resultset->options, "facets"); + if (facets) + facet_list = yaz_pqf_parse_facet_list(c->odr_out, facets); + schema = c->tasks->u.search.schema; break; case ZOOM_TASK_RETRIEVE: resultset = c->tasks->u.retrieve.resultset; + schema = c->tasks->u.retrieve.schema; start = &c->tasks->u.retrieve.start; count = &c->tasks->u.retrieve.count; @@ -168,7 +188,8 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) ZOOM_record rec = ZOOM_record_cache_lookup(resultset, i + *start, c->tasks->u.retrieve.syntax, - c->tasks->u.retrieve.elementSetName); + c->tasks->u.retrieve.elementSetName, + schema); if (!rec) break; else @@ -187,33 +208,42 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) return zoom_complete; } assert(resultset->query); - + sr = ZOOM_srw_get_pdu(c, Z_SRW_searchRetrieve_request); z_query = ZOOM_query_get_Z_Query(resultset->query); if (z_query->which == Z_Query_type_104 && z_query->u.type_104->which == Z_External_CQL) { - sr->u.request->query_type = Z_SRW_query_type_cql; - sr->u.request->query.cql = z_query->u.type_104->u.cql; + sr->u.request->queryType = "cql"; + sr->u.request->query = z_query->u.type_104->u.cql; } else if (z_query->which == Z_Query_type_1 && z_query->u.type_1) { - sr->u.request->query_type = Z_SRW_query_type_pqf; - sr->u.request->query.pqf = - ZOOM_query_get_query_string(resultset->query); + sr->u.request->queryType = "pqf"; + sr->u.request->query = + odr_strdup(c->odr_out, + ZOOM_query_get_query_string(resultset->query)); } else { ZOOM_set_error(c, ZOOM_ERROR_UNSUPPORTED_QUERY, 0); return zoom_complete; } + + option_val = ZOOM_query_get_sru11(resultset->query); + if (option_val) + { + sr->u.request->sort_type = Z_SRW_sort_type_sort; + sr->u.request->sort.sortKeys = odr_strdup(c->odr_out, option_val); + } sr->u.request->startRecord = odr_intdup(c->odr_out, *start + 1); sr->u.request->maximumRecords = odr_intdup( - c->odr_out, (resultset->step > 0 && resultset->step < *count) ? + c->odr_out, (resultset->step > 0 && resultset->step < *count) ? resultset->step : *count); - sr->u.request->recordSchema = resultset->schema; - + sr->u.request->recordSchema = odr_strdup_null(c->odr_out, schema); + sr->u.request->facetList = facet_list; + option_val = ZOOM_resultset_option_get(resultset, "recordPacking"); if (option_val) sr->u.request->recordPacking = odr_strdup(c->odr_out, option_val); @@ -238,7 +268,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c, NMEM nmem; ZOOM_Event event; int *start, *count; - const char *syntax, *elementSetName; + const char *syntax, *elementSetName, *schema; if (!c->tasks) return zoom_complete; @@ -250,14 +280,17 @@ static zoom_ret handle_srw_response(ZOOM_connection c, start = &c->tasks->u.search.start; count = &c->tasks->u.search.count; syntax = c->tasks->u.search.syntax; - elementSetName = c->tasks->u.search.elementSetName; - - if (!c->tasks->u.search.recv_search_fired) - { + elementSetName = c->tasks->u.search.elementSetName; + schema = c->tasks->u.search.schema; + /* Required not for reporting client hit count multiple times into session */ + if (!c->tasks->u.search.recv_search_fired) { + yaz_log(YLOG_DEBUG, "posting ZOOM_EVENT_RECV_SEARCH"); event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH); ZOOM_connection_put_event(c, event); c->tasks->u.search.recv_search_fired = 1; } + if (res->facetList) + ZOOM_handle_facet_list(resultset, res->facetList); break; case ZOOM_TASK_RETRIEVE: resultset = c->tasks->u.retrieve.resultset; @@ -265,6 +298,7 @@ static zoom_ret handle_srw_response(ZOOM_connection c, count = &c->tasks->u.retrieve.count; syntax = c->tasks->u.retrieve.syntax; elementSetName = c->tasks->u.retrieve.elementSetName; + schema = c->tasks->u.retrieve.schema; break; default: return zoom_complete; @@ -283,26 +317,29 @@ static zoom_ret handle_srw_response(ZOOM_connection c, } else { - if (res->numberOfRecords) + if (res->numberOfRecords) { resultset->size = *res->numberOfRecords; + } + if (res->suggestions) { + ZOOM_resultset_option_set(resultset, "suggestions", res->suggestions); + } for (i = 0; inum_records; i++) { - int pos; + int pos = *start + i; Z_SRW_record *sru_rec; Z_SRW_diagnostic *diag = 0; int num_diag; - + Z_NamePlusRecord *npr = (Z_NamePlusRecord *) odr_malloc(c->odr_in, sizeof(Z_NamePlusRecord)); - - if (res->records[i].recordPosition && - *res->records[i].recordPosition > 0) + + /* only trust recordPosition if >= calculated position */ + if (res->records[i].recordPosition && + *res->records[i].recordPosition >= pos + 1) pos = *res->records[i].recordPosition - 1; - else - pos = *start + i; - + sru_rec = &res->records[i]; - + npr->databaseName = 0; npr->which = Z_NamePlusRecord_databaseRecord; npr->u.databaseRecord = (Z_External *) @@ -310,17 +347,14 @@ static zoom_ret handle_srw_response(ZOOM_connection c, npr->u.databaseRecord->descriptor = 0; npr->u.databaseRecord->direct_reference = odr_oiddup(c->odr_in, yaz_oid_recsyn_xml); + npr->u.databaseRecord->indirect_reference = 0; npr->u.databaseRecord->which = Z_External_octet; - - npr->u.databaseRecord->u.octet_aligned = (Odr_oct *) - odr_malloc(c->odr_in, sizeof(Odr_oct)); - npr->u.databaseRecord->u.octet_aligned->buf = (unsigned char*) - sru_rec->recordData_buf; - npr->u.databaseRecord->u.octet_aligned->len = - npr->u.databaseRecord->u.octet_aligned->size = - sru_rec->recordData_len; - - if (sru_rec->recordSchema + + npr->u.databaseRecord->u.octet_aligned = + odr_create_Odr_oct(c->odr_in, + sru_rec->recordData_buf, + sru_rec->recordData_len); + if (sru_rec->recordSchema && !strcmp(sru_rec->recordSchema, "info:srw/schema/1/diagnostics-v1.1")) { @@ -330,15 +364,15 @@ static zoom_ret handle_srw_response(ZOOM_connection c, resultset->odr); } ZOOM_record_cache_add(resultset, npr, pos, syntax, elementSetName, - sru_rec->recordSchema, diag); + schema, diag); } *count -= i; *start += i; if (*count + *start > resultset->size) *count = resultset->size - *start; + yaz_log(YLOG_DEBUG, "SRU result set size " ODR_INT_PRINTF " start %d count %d", resultset->size, *start, *count); if (*count < 0) *count = 0; - nmem = odr_extract_mem(c->odr_in); nmem_transfer(odr_getmem(resultset->odr), nmem); nmem_destroy(nmem); @@ -374,41 +408,46 @@ static void handle_srw_scan_response(ZOOM_connection c, #endif int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres, - zoom_ret *cret) + zoom_ret *cret, char **addinfo) { +#if YAZ_HAVE_XML2 int ret = 0; - const char *addinfo = 0; /* not redirect (normal response) */ if (!yaz_srw_check_content_type(hres)) { - addinfo = "content-type"; + *addinfo = "content-type"; ret = -1; } else if (c->sru_mode == zoom_sru_solr) { Z_SRW_PDU *sr; - ret = yaz_solr_decode(c->odr_in, hres, &sr); + ret = yaz_solr_decode_response(c->odr_in, hres, &sr); if (ret == 0) + { if (sr->which == Z_SRW_searchRetrieve_response) *cret = handle_srw_response(c, sr->u.response); + else if (sr->which == Z_SRW_scan_response) + handle_srw_scan_response(c, sr->u.scan_response); + } } else { Z_SOAP *soap_package = 0; ODR o = c->odr_in; - Z_SOAP_Handler soap_handlers[2] = { - {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec}, + Z_SOAP_Handler soap_handlers[4] = { + {YAZ_XMLNS_SRU_v1_response, 0, (Z_SOAP_fun) yaz_srw_codec}, + {YAZ_XMLNS_SRU_v2_mask, 0, (Z_SOAP_fun) yaz_srw_codec}, + {"searchRetrieveResponse", 0, (Z_SOAP_fun) yaz_srw_codec}, {0, 0, 0} }; ret = z_soap_codec(o, &soap_package, &hres->content_buf, &hres->content_len, soap_handlers); - if (!ret && soap_package->which == Z_SOAP_generic && - soap_package->u.generic->no == 0) + if (!ret && soap_package->which == Z_SOAP_generic) { Z_SRW_PDU *sr = (Z_SRW_PDU*) soap_package->u.generic->p; - + ZOOM_options_set(c->options, "sru_version", sr->srw_version); ZOOM_options_setl(c->options, "sru_extra_response_data", sr->extraResponseData_buf, sr->extraResponseData_len); @@ -427,9 +466,24 @@ int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres, soap_package->u.fault->fault_string); } else + { + size_t max_chars = 1000; + size_t sz = hres->content_len; + if (sz > max_chars - 1) + sz = max_chars; + *addinfo = odr_malloc(c->odr_in, sz + 4); + memcpy(*addinfo, hres->content_buf, sz); + if (sz == max_chars) + strcpy(*addinfo + sz, "..."); + else + strcpy(*addinfo + sz, ""); ret = -1; - } + } + } return ret; +#else + return -1; +#endif } /*