X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=cf0e7d0a84a7546bca8c72cd5e2d437e063525cb;hb=c16b638200ede4f4130c93906a000d0cfbcd9c95;hp=299a5342179513df551c4d3eae2c8087193a4b4a;hpb=49ae06a7901f27cce5657bdc57fd7d147bf59fa1;p=idzebra-moved-to-github.git

diff --git a/index/zsets.c b/index/zsets.c
index 299a534..cf0e7d0 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,5 +1,5 @@
-/* $Id: zsets.c,v 1.44 2003-03-26 16:41:48 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.
@@ -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);
@@ -617,9 +617,9 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
 	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';
-	else if (*sks->sortRelation == Z_SortRelation_descending)
+	else if (*sks->sortRelation == Z_SortKeySpec_descending)
 	    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);
 
-    *sort_status = Z_SortStatus_success;
+    *sort_status = Z_SortResponse_success;
     yaz_log (LOG_LOG, "resultSetSortSingle end");
 }