X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frank1.c;h=d9476840889702d16284f58308c72da5d41ed782;hb=e5ebc859654d84aa9098142b34015648d8e333de;hp=a1f921e1480c29a3eabc4a9341e7f22975a093bb;hpb=f1e7c832bcf4e2ecaaefc01a1cec1ba78e90dd12;p=idzebra-moved-to-github.git

diff --git a/index/rank1.c b/index/rank1.c
index a1f921e..d947684 100644
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1998, Index Data I/S
+ * Copyright (C) 1998-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rank1.c,v $
- * Revision 1.2  1998-03-05 13:03:29  adam
+ * Revision 1.6  2000-03-15 15:00:30  adam
+ * First work on threaded version.
+ *
+ * Revision 1.5  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.4  1999/02/02 14:51:01  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.3  1998/06/12 12:21:53  adam
+ * Fixed memory-leak.
+ *
+ * Revision 1.2  1998/03/05 13:03:29  adam
  * Improved ranking.
  *
  * Revision 1.1  1998/03/05 08:45:12  adam
@@ -15,7 +27,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -53,9 +65,10 @@ static int log2_int (unsigned g)
  * create: Creates/Initialises this rank handler. This routine is 
  *  called exactly once. The routine returns the class_handle.
  */
-static void *create (ZebraHandle zh)
+static void *create (ZebraService zh)
 {
-    struct rank_class_info *ci = xmalloc (sizeof(*ci));
+    struct rank_class_info *ci = (struct rank_class_info *)
+	xmalloc (sizeof(*ci));
 
     logf (LOG_DEBUG, "rank-1 create");
     return ci;
@@ -66,9 +79,9 @@ static void *create (ZebraHandle zh)
  *  when the handler is no longer needed - i.e. when the server
  *  dies. The class_handle was previously returned by create.
  */
-static void destroy (ZebraHandle zh, void *class_handle)
+static void destroy (ZebraService zh, void *class_handle)
 {
-    struct rank_class_info *ci = class_handle;
+    struct rank_class_info *ci = (struct rank_class_info *) class_handle;
 
     logf (LOG_DEBUG, "rank-1 destroy");
     xfree (ci);
@@ -82,13 +95,14 @@ static void destroy (ZebraHandle zh, void *class_handle)
  */
 static void *begin (ZebraHandle zh, void *class_handle, RSET rset)
 {
-    struct rank_set_info *si = xmalloc (sizeof(*si));
+    struct rank_set_info *si = (struct rank_set_info *) xmalloc (sizeof(*si));
     int i;
 
     logf (LOG_DEBUG, "rank-1 begin");
     si->no_entries = rset->no_rset_terms;
     si->no_rank_entries = 0;
-    si->entries = xmalloc (sizeof(*si->entries)*si->no_entries);
+    si->entries = (struct rank_term_info *)
+	xmalloc (sizeof(*si->entries)*si->no_entries);
     for (i = 0; i < si->no_entries; i++)
     {
 	int g = rset->rset_terms[i]->nn;
@@ -113,8 +127,9 @@ static void *begin (ZebraHandle zh, void *class_handle, RSET rset)
  */
 static void end (ZebraHandle zh, void *set_handle)
 {
-    struct rank_set_info *si = set_handle;
+    struct rank_set_info *si = (struct rank_set_info *) set_handle;
     logf (LOG_DEBUG, "rank-1 end");
+    xfree (si->entries);
     xfree (si);
 }
 
@@ -125,7 +140,7 @@ static void end (ZebraHandle zh, void *set_handle)
  */
 static void add (void *set_handle, int seqno, int term_index)
 {
-    struct rank_set_info *si = set_handle;
+    struct rank_set_info *si = (struct rank_set_info *) set_handle;
     logf (LOG_DEBUG, "rank-1 add seqno=%d term_index=%d", seqno, term_index);
     si->last_pos = seqno;
     si->entries[term_index].local_occur++;
@@ -140,7 +155,7 @@ static void add (void *set_handle, int seqno, int term_index)
 static int calc (void *set_handle, int sysno)
 {
     int i, lo, divisor, score = 0;
-    struct rank_set_info *si = set_handle;
+    struct rank_set_info *si = (struct rank_set_info *) set_handle;
 
     logf (LOG_DEBUG, "rank-1 calc sysno=%d", sysno);