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
Set resultCount to 0 in sort handler of frontend server
[yaz-moved-to-github.git]
/
server
/
seshigh.c
diff --git
a/server/seshigh.c
b/server/seshigh.c
index
634bc4e
..
8732dc4
100644
(file)
--- a/
server/seshigh.c
+++ b/
server/seshigh.c
@@
-2,7
+2,7
@@
* Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
* Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.157 2003-05-20 20:22:11 adam Exp $
+ * $Id: seshigh.c,v 1.160 2003-07-16 21:02:06 adam Exp $
*/
/*
*/
/*
@@
-326,10
+326,10
@@
void ir_session(IOCHAN h, int event)
odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
{
odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
{
- yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [addinfo %s] "
+ yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [element %s] "
"[near byte %d] ",
odr_errmsg(odr_geterror(assoc->decode)),
"[near byte %d] ",
odr_errmsg(odr_geterror(assoc->decode)),
- odr_getaddinfo(assoc->decode),
+ odr_getelement(assoc->decode),
odr_offset(assoc->decode));
if (assoc->decode->error != OHTTP)
{
odr_offset(assoc->decode));
if (assoc->decode->error != OHTTP)
{
@@
-770,7
+770,7
@@
static char *uri_val(const char *path, const char *name, ODR o)
const char *p1 = strchr(path, '=');
if (!p1)
break;
const char *p1 = strchr(path, '=');
if (!p1)
break;
- if (p1 - path == nlen && !memcmp(path, name, nlen))
+ if ((size_t)(p1 - path) == nlen && !memcmp(path, name, nlen))
{
size_t i = 0;
char *ret;
{
size_t i = 0;
char *ret;
@@
-1383,9
+1383,9
@@
static int process_gdu_response(association *assoc, request *req, Z_GDU *res)
}
if (!z_GDU(assoc->encode, &res, 0, 0))
{
}
if (!z_GDU(assoc->encode, &res, 0, 0))
{
- yaz_log(LOG_WARN, "ODR error when decoding PDU: %s [addinfo %s]",
+ yaz_log(LOG_WARN, "ODR error when decoding PDU: %s [element %s]",
odr_errmsg(odr_geterror(assoc->decode)),
odr_errmsg(odr_geterror(assoc->decode)),
- odr_getaddinfo(assoc->decode));
+ odr_getelement(assoc->decode));
return -1;
}
req->response = odr_getbuf(assoc->encode, &req->len_response,
return -1;
}
req->response = odr_getbuf(assoc->encode, &req->len_response,
@@
-2298,6
+2298,7
@@
static Z_APDU *process_sortRequest(association *assoc, request *reqb,
res->num_diagnostics = 0;
res->diagnostics = 0;
}
res->num_diagnostics = 0;
res->diagnostics = 0;
}
+ res->resultCount = 0;
res->otherInfo = 0;
apdu->which = Z_APDU_sortResponse;
res->otherInfo = 0;
apdu->which = Z_APDU_sortResponse;