X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-sru.c;h=d7f19cb4a96d4124a31825678c017ccfe95aad66;hp=433e8714f01499b4ba9d1ad1ef037b71ced37fbd;hb=0e7fdbc857d4905e67a7bdf8fe5b6c773ee47a7b;hpb=6e120dc3c508279e1733049e7aeb4626645d5eef diff --git a/src/zoom-sru.c b/src/zoom-sru.c index 433e871..d7f19cb 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-2012 Index Data * See the file LICENSE for details. */ /** * \file zoom-sru.c * \brief Implements ZOOM SRU */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -33,12 +36,10 @@ 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) { @@ -60,6 +61,8 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr) return zoom_complete; if (c->odr_print) z_GDU(c->odr_print, &gdu, 0, 0); + if (c->odr_save) + z_GDU(c->odr_save, &gdu, 0, 0); c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0); event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU); @@ -100,14 +103,14 @@ zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c) { sr->u.scan_request->query_type = Z_SRW_query_type_cql; sr->u.scan_request->scanClause.cql = - ZOOM_query_get_query_string(scan->query); + 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); + odr_strdup(c->odr_out, ZOOM_query_get_query_string(scan->query)); } else { @@ -135,6 +138,7 @@ 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; @@ -154,10 +158,9 @@ 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; - const char *facets = ZOOM_options_get(resultset->options, "facets"); - if (facets) { + facets = ZOOM_options_get(resultset->options, "facets"); + if (facets) facet_list = yaz_pqf_parse_facet_list(c->odr_out, facets); - } break; case ZOOM_TASK_RETRIEVE: resultset = c->tasks->u.retrieve.resultset; @@ -208,13 +211,21 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) { sr->u.request->query_type = Z_SRW_query_type_pqf; sr->u.request->query.pqf = - ZOOM_query_get_query_string(resultset->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) ? @@ -260,8 +271,9 @@ static zoom_ret handle_srw_response(ZOOM_connection c, syntax = c->tasks->u.search.syntax; elementSetName = c->tasks->u.search.elementSetName; - if (!c->tasks->u.search.recv_search_fired) - { + /* 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; @@ -296,6 +308,9 @@ static zoom_ret handle_srw_response(ZOOM_connection c, 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; @@ -324,6 +339,7 @@ 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 *) @@ -388,15 +404,15 @@ 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) @@ -441,9 +457,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 } /*