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
Fixed bug #255: EXTERNAL decoding with ASN.1 types in octet strings.
[yaz-moved-to-github.git]
/
src
/
seshigh.c
diff --git
a/src/seshigh.c
b/src/seshigh.c
index
fffdd11
..
64eeae1
100644
(file)
--- a/
src/seshigh.c
+++ b/
src/seshigh.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1995-2005, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.43 2005-01-11 12:07:55 adam Exp $
+ * $Id: seshigh.c,v 1.46 2005-01-19 09:18:08 adam Exp $
*/
/**
* \file seshigh.c
*/
/**
* \file seshigh.c
@@
-30,18
+30,25
@@
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
+#include <assert.h>
+#include <ctype.h>
+
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
#ifdef WIN32
#include <io.h>
#define S_ISREG(x) (x & _S_IFREG)
#include <process.h>
#ifdef WIN32
#include <io.h>
#define S_ISREG(x) (x & _S_IFREG)
#include <process.h>
-#include <sys/stat.h>
-#else
-#include <sys/stat.h>
+#endif
+
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <unistd.h>
#endif
-#include <assert.h>
-#include <ctype.h>
#include <yaz/yconfig.h>
#include <yaz/xmalloc.h>
#include <yaz/yconfig.h>
#include <yaz/xmalloc.h>
@@
-1577,7
+1584,7
@@
static Z_APDU *process_initRequest(association *assoc, request *reqb)
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.43 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.46 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,
@@
-2265,12
+2272,14
@@
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
if (log_request)
{
WRBUF wr = wrbuf_alloc();
if (log_request)
{
WRBUF wr = wrbuf_alloc();
- if (*res->scanStatus == Z_Scan_success)
- wrbuf_printf(wr, "OK ");
- else
+ if (bsrr->errcode)
wr_diag(wr, bsrr->errcode, bsrr->errstring);
wr_diag(wr, bsrr->errcode, bsrr->errstring);
+ else if (*res->scanStatus == Z_Scan_success)
+ wrbuf_printf(wr, "OK");
+ else
+ wrbuf_printf(wr, "Partial");
- wrbuf_printf(wr, "%d+%d %d ",
+ wrbuf_printf(wr, " %d+%d %d ",
*req->preferredPositionInResponse,
*req->numberOfTermsRequested,
(res->stepSize ? *res->stepSize : 0));
*req->preferredPositionInResponse,
*req->numberOfTermsRequested,
(res->stepSize ? *res->stepSize : 0));