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
WIN32 compile (again)
[idzebra-moved-to-github.git]
/
index
/
extract.c
diff --git
a/index/extract.c
b/index/extract.c
index
a726916
..
4025943
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-3,7
+3,7
@@
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: extract.c,v 1.110 2002-02-20 17:30:01 adam Exp $
+ * $Id: extract.c,v 1.112 2002-03-14 18:41:59 adam Exp $
*/
#include <stdio.h>
#include <assert.h>
*/
#include <stdio.h>
#include <assert.h>
@@
-426,6
+426,7
@@
static int recordExtract (ZebraHandle zh,
zh->keys.prevAttrUse = -1;
zh->keys.prevAttrSet = -1;
zh->keys.prevSeqNo = 0;
zh->keys.prevAttrUse = -1;
zh->keys.prevAttrSet = -1;
zh->keys.prevSeqNo = 0;
+ zh->sortKeys = 0;
recordOffset = fi->file_moffset;
extractCtrl.offset = fi->file_moffset;
recordOffset = fi->file_moffset;
extractCtrl.offset = fi->file_moffset;
@@
-855,7
+856,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
RecordAttr *recordAttr;
struct recExtractCtrl extractCtrl;
int i, r;
RecordAttr *recordAttr;
struct recExtractCtrl extractCtrl;
int i, r;
- char *matchStr;
+ char *matchStr = 0;
RecType recType;
char subType[1024];
void *clientData;
RecType recType;
char subType[1024];
void *clientData;
@@
-945,7
+946,6
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
}
/* match criteria */
}
/* match criteria */
-
if (! *sysno)
{
/* new record */
if (! *sysno)
{
/* new record */
@@
-1442,15
+1442,14
@@
static void extract_add_sort_string (RecWord *p, const char *string,
{
struct sortKey *sk;
ZebraHandle zh = p->extractCtrl->handle;
{
struct sortKey *sk;
ZebraHandle zh = p->extractCtrl->handle;
- struct sortKey *sortKeys = zh->sortKeys;
- for (sk = sortKeys; sk; sk = sk->next)
+ for (sk = zh->sortKeys; sk; sk = sk->next)
if (sk->attrSet == p->attrSet && sk->attrUse == p->attrUse)
return;
sk = (struct sortKey *) xmalloc (sizeof(*sk));
if (sk->attrSet == p->attrSet && sk->attrUse == p->attrUse)
return;
sk = (struct sortKey *) xmalloc (sizeof(*sk));
- sk->next = sortKeys;
- sortKeys = sk;
+ sk->next = zh->sortKeys;
+ zh->sortKeys = sk;
sk->string = (char *) xmalloc (length);
sk->length = length;
sk->string = (char *) xmalloc (length);
sk->length = length;
@@
-1597,6
+1596,7
@@
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
xfree (sk);
sk = sk_next;
}
xfree (sk);
sk = sk_next;
}
+ yaz_log (LOG_LOG, "extract_flushSortKeys");
*skp = 0;
}
*skp = 0;
}