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
Always set parent member in data1_node
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
51e48af
..
cf0e7d0
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-1,5
+1,5
@@
-/* $Id: zsets.c,v 1.45 2003-05-20 12:52:50 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zsets.c,v 1.47 2004-05-10 08:47:54 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-70,7
+70,7
@@
struct zset_sort_info {
struct zset_sort_entry **entries;
};
struct zset_sort_entry **entries;
};
-ZebraSet resultSetAddRPN (ZebraHandle zh,
+ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m,
Z_RPNQuery *rpn, int num_bases,
char **basenames,
const char *setname)
Z_RPNQuery *rpn, int num_bases,
char **basenames,
const char *setname)
@@
-87,7
+87,7
@@
ZebraSet resultSetAddRPN (ZebraHandle zh,
return 0;
zebraSet->locked = 1;
zebraSet->rpn = 0;
return 0;
zebraSet->locked = 1;
zebraSet->rpn = 0;
- zebraSet->nmem = nmem_create ();
+ zebraSet->nmem = m;
zebraSet->num_bases = num_bases;
zebraSet->basenames =
zebraSet->num_bases = num_bases;
zebraSet->basenames =
@@
-617,9
+617,9
@@
void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
Z_SortKeySpec *sks = sort_sequence->specs[i];
Z_SortKey *sk;
Z_SortKeySpec *sks = sort_sequence->specs[i];
Z_SortKey *sk;
- if (*sks->sortRelation == Z_SortRelation_ascending)
+ if (*sks->sortRelation == Z_SortKeySpec_ascending)
sort_criteria[i].relation = 'A';
sort_criteria[i].relation = 'A';
- else if (*sks->sortRelation == Z_SortRelation_descending)
+ else if (*sks->sortRelation == Z_SortKeySpec_descending)
sort_criteria[i].relation = 'D';
else
{
sort_criteria[i].relation = 'D';
else
{
@@
-687,7
+687,7
@@
void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
rset->rset_terms[i]->flags,
rset->rset_terms[i]->count);
rset->rset_terms[i]->flags,
rset->rset_terms[i]->count);
- *sort_status = Z_SortStatus_success;
+ *sort_status = Z_SortResponse_success;
yaz_log (LOG_LOG, "resultSetSortSingle end");
}
yaz_log (LOG_LOG, "resultSetSortSingle end");
}