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
ODR handles no longer needed for zebra_search_{rpn,PQF}
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
ac28c8e
..
51e48af
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-1,4
+1,4
@@
-/* $Id: zsets.c,v 1.42 2003-02-27 22:55:40 adam Exp $
+/* $Id: zsets.c,v 1.45 2003-05-20 12:52:50 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
@@
-70,7
+70,7
@@
struct zset_sort_info {
struct zset_sort_entry **entries;
};
struct zset_sort_entry **entries;
};
-ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
+ZebraSet resultSetAddRPN (ZebraHandle zh,
Z_RPNQuery *rpn, int num_bases,
char **basenames,
const char *setname)
Z_RPNQuery *rpn, int num_bases,
char **basenames,
const char *setname)
@@
-96,7
+96,7
@@
ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
zebraSet->basenames[i] = nmem_strdup (zebraSet->nmem, basenames[i]);
zebraSet->basenames[i] = nmem_strdup (zebraSet->nmem, basenames[i]);
- zebraSet->rset = rpn_search (zh, output->mem, rpn,
+ zebraSet->rset = rpn_search (zh, zebraSet->nmem, rpn,
zebraSet->num_bases,
zebraSet->basenames, zebraSet->name,
zebraSet);
zebraSet->num_bases,
zebraSet->basenames, zebraSet->name,
zebraSet);
@@
-691,7
+691,7
@@
void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
yaz_log (LOG_LOG, "resultSetSortSingle end");
}
yaz_log (LOG_LOG, "resultSetSortSingle end");
}
-RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId)
+RSET resultSetRef (ZebraHandle zh, const char *resultSetId)
{
ZebraSet s;
{
ZebraSet s;
@@
-765,7
+765,7
@@
ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name)
if (p && !p->init_flag)
{
if (p->control->create)
if (p && !p->init_flag)
{
if (p->control->create)
- p->class_handle = (*p->control->create)(zh->reg);
+ p->class_handle = (*p->control->create)(zh);
p->init_flag = 1;
}
return p;
p->init_flag = 1;
}
return p;