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
Fixed bad memory reference that could occur if empty key block was to
[idzebra-moved-to-github.git]
/
index
/
extract.c
diff --git
a/index/extract.c
b/index/extract.c
index
f6fab5d
..
b4f7ee7
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-1,4
+1,4
@@
-/* $Id: extract.c,v 1.252 2007-03-14 11:48:32 adam Exp $
+/* $Id: extract.c,v 1.254 2007-03-20 22:07:21 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-600,13
+600,19
@@
ZEBRA_RES zebra_extract_record_stream(ZebraHandle zh,
extractCtrl.handle = zh;
extractCtrl.match_criteria[0] = '\0';
extractCtrl.staticrank = 0;
extractCtrl.handle = zh;
extractCtrl.match_criteria[0] = '\0';
extractCtrl.staticrank = 0;
+ extractCtrl.action = action;
init_extractCtrl(zh, &extractCtrl);
init_extractCtrl(zh, &extractCtrl);
-
+
extract_set_store_data_prepare(&extractCtrl);
r = (*recType->extract)(recTypeClientData, &extractCtrl);
extract_set_store_data_prepare(&extractCtrl);
r = (*recType->extract)(recTypeClientData, &extractCtrl);
+ if (action == action_update)
+ {
+ action = extractCtrl.action;
+ }
+
switch (r)
{
case RECCTRL_EXTRACT_EOF:
switch (r)
{
case RECCTRL_EXTRACT_EOF:
@@
-916,6
+922,8
@@
ZEBRA_RES zebra_extract_explain(void *handle, Record rec, data1_node *n)
extractCtrl.flagShowRecords = 0;
extractCtrl.match_criteria[0] = '\0';
extractCtrl.staticrank = 0;
extractCtrl.flagShowRecords = 0;
extractCtrl.match_criteria[0] = '\0';
extractCtrl.staticrank = 0;
+ extractCtrl.action = action_update;
+
extractCtrl.handle = handle;
extractCtrl.first_record = 1;
extractCtrl.handle = handle;
extractCtrl.first_record = 1;