/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/**
#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)
{
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");
gdu = z_get_HTTP_Request_uri(c->odr_out, c->host_port,
{
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);
- 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);
- ZOOM_connection_put_event(c, event);
- odr_reset(c->odr_out);
- return ZOOM_send_buf(c);
+ return ZOOM_send_GDU(c, gdu);
}
#endif
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
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 =
+ 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 =
+ sr->u.scan_request->queryType = "pqf";
+ sr->u.scan_request->scanClause =
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);
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 */
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;
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
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 =
- odr_strdup(c->odr_out,
+ 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->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);
NMEM nmem;
ZOOM_Event event;
int *start, *count;
- const char *syntax, *elementSetName;
+ const char *syntax, *elementSetName, *schema;
if (!c->tasks)
return zoom_complete;
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;
+ 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");
c->tasks->u.search.recv_search_fired = 1;
}
if (res->facetList)
- handle_facet_list(resultset, res->facetList);
+ ZOOM_handle_facet_list(resultset, res->facetList);
break;
case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
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;
}
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));
- /* recordPosition is 1 based */
- 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 *)
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"))
{
resultset->odr);
}
ZOOM_record_cache_add(resultset, npr, pos, syntax, elementSetName,
- sru_rec->recordSchema, diag);
+ schema, diag);
}
*count -= i;
*start += i;
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[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);
strcpy(*addinfo + sz, "");
ret = -1;
}
- }
+ }
return ret;
#else
return -1;
projects / yaz-moved-to-github.git / blobdiff