/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
/**
* \file zoom-sru.c
* \brief Implements ZOOM SRU
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <string.h>
#include "zoom-p.h"
#include <yaz/log.h>
+#include <yaz/pquery.h>
+
+void handle_facet_list(ZOOM_resultset r, Z_FacetList *fl);
#if YAZ_HAVE_XML2
static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d)
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)
{
{
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
{
#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;
Z_Query *z_query;
-
+ Z_FacetList *facet_list = 0;
if (c->error) /* don't continue on error */
return zoom_complete;
assert(c->tasks);
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);
break;
case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
{
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) ?
resultset->step : *count);
sr->u.request->recordSchema = resultset->schema;
+ sr->u.request->facetList = facet_list;
option_val = ZOOM_resultset_option_get(resultset, "recordPacking");
if (option_val)
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;
}
+ if (res->facetList)
+ handle_facet_list(resultset, res->facetList);
break;
case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
{
if (res->numberOfRecords) {
resultset->size = *res->numberOfRecords;
- yaz_log(YLOG_DEBUG, "res numberOfRecords " ODR_INT_PRINTF, *res->numberOfRecords);
+ }
+ if (res->suggestions) {
+ ZOOM_resultset_option_set(resultset, "suggestions", res->suggestions);
}
for (i = 0; i<res->num_records; i++)
{
pos = *res->records[i].recordPosition - 1;
else
pos = *start + i;
- yaz_log(YLOG_DEBUG, "pos %d start %d ", pos, *start);
-
+
sru_rec = &res->records[i];
npr->databaseName = 0;
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 *)
#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)
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
}
/*
projects / yaz-moved-to-github.git / blobdiff