projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change types of signed/unsigned int
[idzebra-moved-to-github.git]
/
index
/
extract.c
diff --git
a/index/extract.c
b/index/extract.c
index
7b3e108
..
b4bd663
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-1,4
+1,4
@@
-/* $Id: extract.c,v 1.131 2002-11-15 21:26:00 adam Exp $
+/* $Id: extract.c,v 1.135 2003-02-25 21:51:05 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-943,8
+943,6
@@
int bufferExtractRecord (ZebraHandle zh,
RecType recType;
char subType[1024];
void *clientData;
RecType recType;
char subType[1024];
void *clientData;
- SYSNO sysnotmp;
- // const char *fname = "<no file>";
Record rec;
long recordOffset = 0;
struct zebra_fetch_control fc;
Record rec;
long recordOffset = 0;
struct zebra_fetch_control fc;
@@
-1592,7
+1590,7
@@
static void extract_add_sort_string (RecWord *p, const char *string,
{
ZebraHandle zh = p->extractCtrl->handle;
struct sortKeys *sk = &zh->reg->sortKeys;
{
ZebraHandle zh = p->extractCtrl->handle;
struct sortKeys *sk = &zh->reg->sortKeys;
- size_t off = 0;
+ int off = 0;
while (off < sk->buf_used)
{
while (off < sk->buf_used)
{
@@
-1727,6
+1725,12
@@
static void extract_add_complete_field (RecWord *p)
void extract_token_add (RecWord *p)
{
WRBUF wrbuf;
void extract_token_add (RecWord *p)
{
WRBUF wrbuf;
+
+#if 0
+ yaz_log (LOG_LOG, "reg_type=%c attrSet=%d attrUse=%d seqno=%d s=%.*s",
+ p->reg_type, p->attrSet, p->attrUse, p->seqno, p->length,
+ p->string);
+#endif
if ((wrbuf = zebra_replace(p->zebra_maps, p->reg_type, 0,
p->string, p->length)))
{
if ((wrbuf = zebra_replace(p->zebra_maps, p->reg_type, 0,
p->string, p->length)))
{
@@
-1749,13
+1753,13
@@
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct sortKeys *sk)
{
SortIdx sortIdx = zh->reg->sortIdx;
int cmd, struct sortKeys *sk)
{
SortIdx sortIdx = zh->reg->sortIdx;
- size_t off = 0;
+ int off = 0;
sortIdx_sysno (sortIdx, sysno);
while (off < sk->buf_used)
{
sortIdx_sysno (sortIdx, sysno);
while (off < sk->buf_used)
{
- int set, use, slen, l;
+ int set, use, slen;
off += key_SU_decode(&set, sk->buf + off);
off += key_SU_decode(&use, sk->buf + off);
off += key_SU_decode(&set, sk->buf + off);
off += key_SU_decode(&use, sk->buf + off);