X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=73e45b0b145baf71a0e45bcb1caaaeee321beb98;hb=ae2d0647bd3a555df77397b6c2f9c129fda0733a;hp=9ced5ee9828ad3f525bb0d0c79fd83e5a9eb7611;hpb=48d62eb784b4476f4be281417b94878e7169bf2c;p=idzebra-moved-to-github.git

diff --git a/index/zsets.c b/index/zsets.c
index 9ced5ee..73e45b0 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.41 2003-01-13 22:45:22 adam Exp $
+/* $Id: zsets.c,v 1.46 2003-06-18 11:46:34 adam Exp $
    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;
 };
 
-ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
+ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m,
 			  Z_RPNQuery *rpn, int num_bases,
                           char **basenames, 
 			  const char *setname)
@@ -87,7 +87,7 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
 	return 0;
     zebraSet->locked = 1;
     zebraSet->rpn = 0;
-    zebraSet->nmem = nmem_create ();
+    zebraSet->nmem = m;
 
     zebraSet->num_bases = num_bases;
     zebraSet->basenames = 
@@ -96,7 +96,7 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
         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);
@@ -691,7 +691,7 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
     yaz_log (LOG_LOG, "resultSetSortSingle end");
 }
 
-RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId)
+RSET resultSetRef (ZebraHandle zh, const char *resultSetId)
 {
     ZebraSet s;
 
@@ -717,7 +717,7 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
 
     yaz_log (LOG_LOG, "resultSetRank");
 
-    rank_class = zebraRankLookup (zh, "rank-1");
+    rank_class = zebraRankLookup (zh, res_get_def(zh->res, "rank", "rank-1"));
     rc = rank_class->control;
 
     if (rset_read (rset, rfd, &key, &term_index))
@@ -765,7 +765,7 @@ ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name)
     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;