projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
src
/
zoom-sru.c
diff --git
a/src/zoom-sru.c
b/src/zoom-sru.c
index
83e162f
..
105970f
100644
(file)
--- a/
src/zoom-sru.c
+++ b/
src/zoom-sru.c
@@
-36,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");
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)
{
if (c->sru_mode == zoom_sru_get)
{
@@
-159,9
+157,8
@@
zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
start = &c->tasks->u.search.start;
count = &c->tasks->u.search.count;
facets = ZOOM_options_get(resultset->options, "facets");
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);
facet_list = yaz_pqf_parse_facet_list(c->odr_out, facets);
- }
break;
case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
break;
case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
@@
-329,6
+326,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->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 *)
npr->u.databaseRecord->which = Z_External_octet;
npr->u.databaseRecord->u.octet_aligned = (Odr_oct *)