/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/**
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)
{
{
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
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);
{
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
{
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);
start = &c->tasks->u.search.start;
count = &c->tasks->u.search.count;
facets = ZOOM_options_get(resultset->options, "facets");
- if (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;
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);
{
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) ?
+ 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)
sr->u.request->recordPacking = odr_strdup(c->odr_out, option_val);
start = &c->tasks->u.search.start;
count = &c->tasks->u.search.count;
syntax = c->tasks->u.search.syntax;
- elementSetName = c->tasks->u.search.elementSetName;
+ elementSetName = c->tasks->u.search.elementSetName;
/* Required not for reporting client hit count multiple times into session */
if (!c->tasks->u.search.recv_search_fired) {
if (res->numberOfRecords) {
resultset->size = *res->numberOfRecords;
}
+ if (res->suggestions) {
+ ZOOM_resultset_option_set(resultset, "suggestions", res->suggestions);
+ }
for (i = 0; i<res->num_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));
- /*
- * TODO This does not work with 0-based recordPositions.
- * We will iterate over one twice
- */
- 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 *)
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 =
+ npr->u.databaseRecord->u.octet_aligned->len =
+ npr->u.databaseRecord->u.octet_aligned->size =
sru_rec->recordData_len;
-
- if (sru_rec->recordSchema
+
+ if (sru_rec->recordSchema
&& !strcmp(sru_rec->recordSchema,
"info:srw/schema/1/diagnostics-v1.1"))
{
#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_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[3] = {
+ {YAZ_XMLNS_SRU_v1_response, 0, (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_SRU_v2_response, 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);
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;
projects / yaz-moved-to-github.git / blobdiff