projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0d7bebc
)
Fix calculation of length of structured records in GFS record packer
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 25 Dec 2003 15:25:08 +0000
(15:25 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 25 Dec 2003 15:25:08 +0000
(15:25 +0000)
src/seshigh.c
patch
|
blob
|
history
diff --git
a/src/seshigh.c
b/src/seshigh.c
index
7675581
..
b0fb3d3
100644
(file)
--- a/
src/seshigh.c
+++ b/
src/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.6 2003-12-21 11:33:29 adam Exp $
+ * $Id: seshigh.c,v 1.7 2003-12-25 15:25:08 adam Exp $
*/
/*
*/
/*
@@
-1539,7
+1539,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.6 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.7 $");
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,
@@
-1780,9
+1780,9
@@
static Z_Records *pack_records(association *a, char *setname, int start,
if (freq.len >= 0)
this_length = freq.len;
else
if (freq.len >= 0)
this_length = freq.len;
else
- this_length = odr_total(a->encode) - total_length;
- yaz_log(LOG_DEBUG, " fetched record, len=%d, total=%d",
- this_length, total_length);
+ this_length = odr_total(a->encode) - total_length - dumped_records;
+ yaz_log(LOG_DEBUG, " fetched record, len=%d, total=%d dumped=%d",
+ this_length, total_length, dumped_records);
if (this_length + total_length > a->preferredMessageSize)
{
/* record is small enough, really */
if (this_length + total_length > a->preferredMessageSize)
{
/* record is small enough, really */