/* 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
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
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->recordSchema = odr_strdup_null(c->odr_out, schema);
sr->u.request->facetList = facet_list;
option_val = ZOOM_resultset_option_get(resultset, "recordPacking");
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;
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
{