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
Add yaz_use_atttribute_create to private API
[yaz-moved-to-github.git]
/
src
/
seshigh.c
diff --git
a/src/seshigh.c
b/src/seshigh.c
index
aaf0618
..
e739d3a
100644
(file)
--- a/
src/seshigh.c
+++ b/
src/seshigh.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* 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.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-25,6
+25,9
@@
* minimize memory allocation/deallocation during normal operation.
*
*/
* minimize memory allocation/deallocation during normal operation.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <limits.h>
#include <stdlib.h>
#include <limits.h>
#include <stdlib.h>
@@
-950,6
+953,7
@@
static void srw_bend_search(association *assoc,
rr.errcode = 0;
rr.errstring = 0;
rr.search_info = 0;
rr.errcode = 0;
rr.errstring = 0;
rr.search_info = 0;
+ rr.search_input = 0;
yaz_log_zquery_level(log_requestdetail,rr.query);
(assoc->init->bend_search)(assoc->backend, &rr);
yaz_log_zquery_level(log_requestdetail,rr.query);
(assoc->init->bend_search)(assoc->backend, &rr);
@@
-1139,7
+1143,7
@@
static void srw_bend_search(association *assoc,
(srw_res->numberOfRecords ?
*srw_res->numberOfRecords : 0));
}
(srw_res->numberOfRecords ?
*srw_res->numberOfRecords : 0));
}
- wrbuf_printf(wr, " %s " ODR_INT_PRINTF " +%d",
+ wrbuf_printf(wr, " %s " ODR_INT_PRINTF "+%d",
(srw_res->resultSetId ?
srw_res->resultSetId : "-"),
(srw_req->startRecord ? *srw_req->startRecord : 1),
(srw_res->resultSetId ?
srw_res->resultSetId : "-"),
(srw_req->startRecord ? *srw_req->startRecord : 1),
@@
-1906,7
+1910,7
@@
static void process_http_request(association *assoc, request *req)
keepalive = 1;
hres->version = "1.1";
}
keepalive = 1;
hres->version = "1.1";
}
- if (!keepalive)
+ if (!keepalive || !assoc->last_control->keepalive)
{
z_HTTP_header_add(o, &hres->headers, "Connection", "close");
assoc->state = ASSOC_DEAD;
{
z_HTTP_header_add(o, &hres->headers, "Connection", "close");
assoc->state = ASSOC_DEAD;
@@
-2158,7
+2162,7
@@
static Z_APDU *process_initRequest(association *assoc, request *reqb)
yaz_log(log_requestdetail, "Config: %s",
cb->configname);
yaz_log(log_requestdetail, "Config: %s",
cb->configname);
- iochan_settimeout(assoc->client_chan, cb->idle_timeout * 60);
+ iochan_settimeout(assoc->client_chan, cb->idle_timeout);
/* we have a backend control block, so call that init function */
if (!(binitres = (*cb->bend_init)(assoc->init)))
/* we have a backend control block, so call that init function */
if (!(binitres = (*cb->bend_init)(assoc->init)))
@@
-2501,6
+2505,7
@@
static Z_Records *pack_records(association *a, char *setname, Odr_int start,
}
if (freq.record == 0) /* no error and no record ? */
{
}
if (freq.record == 0) /* no error and no record ? */
{
+ *pres = Z_PresentStatus_partial_4;
*next = 0; /* signal end-of-set and stop */
break;
}
*next = 0; /* signal end-of-set and stop */
break;
}
@@
-2617,6
+2622,7
@@
static Z_APDU *process_searchRequest(association *assoc, request *reqb)
bsrr->errcode = 0;
bsrr->errstring = NULL;
bsrr->search_info = NULL;
bsrr->errcode = 0;
bsrr->errstring = NULL;
bsrr->search_info = NULL;
+ bsrr->search_input = req->otherInfo;
if (assoc->server && assoc->server->cql_transform
&& req->query->which == Z_Query_type_104
if (assoc->server && assoc->server->cql_transform
&& req->query->which == Z_Query_type_104