X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=3d7b61d68f5a12cad5ee73e97e917fa2758d878b;hb=6684933a7dbf61609c4c4a1db1ebb8d80169ad05;hp=e010d2238b8c8ef76bd7da097903aa70263bc598;hpb=9ceac3e96fe083b93b6fd4a676003dd10482e465;p=idzebra-moved-to-github.git

diff --git a/index/zsets.c b/index/zsets.c
index e010d22..3d7b61d 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.105 2006-05-30 21:41:35 adam Exp $
+/* $Id: zsets.c,v 1.108 2006-06-22 15:07:20 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -856,7 +856,9 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem,
 		    i+1);
             sort_criteria[i].numerical = 0;
             sort_criteria[i].ord = 
-                zebraExplain_lookup_attr_str(zh->reg->zei, 's',
+                zebraExplain_lookup_attr_str(zh->reg->zei,
+                                             zinfo_index_category_sort,
+                                             's',
                                              sk->u.sortField);
             if (sks->which != Z_SortKeySpec_null
                 && sort_criteria[i].ord == -1)
@@ -954,7 +956,7 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
     {
 	RSFD rfd = rset_open(rset, RSETF_READ);
 	struct rank_control *rc = rank_class->control;
-	double score;
+	int score;
 	zint count = 0;
 	
 	void *handle =
@@ -1172,8 +1174,8 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
 	NMEM nmem = nmem_create();
 	struct it_key key;
 	RSET rsets[2], rset_comb;
-	RSET rset_temp = rstemp_create(nmem, kc, kc->scope, 
-				       res_get (zh->res, "setTmpDir"),0 );
+	RSET rset_temp = rset_create_temp(nmem, kc, kc->scope, 
+                                          res_get (zh->res, "setTmpDir"),0 );
 	
 	TERMID termid;
 	RSFD rsfd = rset_open(rset_temp, RSETF_WRITE);
@@ -1189,7 +1191,7 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
 	rsets[0] = rset_temp;
 	rsets[1] = rset_dup(sset->rset);
 	
-	rset_comb = rsmulti_and_create(nmem, kc, kc->scope, 2, rsets);
+	rset_comb = rset_create_and(nmem, kc, kc->scope, 2, rsets);
 
 	rsfd = rset_open(rset_comb, RSETF_READ);