X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frank1.c;h=d43204c53d21dfecf4da731f0d3ced12c1812572;hb=c95a9e501773dedb579f26c59bfd529d0ef9c6ec;hp=3369c7925ab997305667b946141dee458823798a;hpb=ce3907338568fce46c5751e7e1091a5ad1c8e291;p=idzebra-moved-to-github.git

diff --git a/index/rank1.c b/index/rank1.c
index 3369c79..d43204c 100644
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rank1.c,v $
- * Revision 1.1  1998-03-05 08:45:12  adam
+ * 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
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -112,6 +118,7 @@ static void end (ZebraHandle zh, void *set_handle)
 {
     struct rank_set_info *si = set_handle;
     logf (LOG_DEBUG, "rank-1 end");
+    xfree (si->entries);
     xfree (si);
 }
 
@@ -136,7 +143,7 @@ static void add (void *set_handle, int seqno, int term_index)
  */
 static int calc (void *set_handle, int sysno)
 {
-    int i, lu, score = 0;
+    int i, lo, divisor, score = 0;
     struct rank_set_info *si = set_handle;
 
     logf (LOG_DEBUG, "rank-1 calc sysno=%d", sysno);
@@ -144,11 +151,13 @@ static int calc (void *set_handle, int sysno)
     if (!si->no_rank_entries)
 	return -1;
     for (i = 0; i < si->no_entries; i++)
-	if (si->entries[i].rank_flag && (lu = si->entries[i].local_occur))
-	    score += (2+log2_int (lu)) * si->entries[i].global_inv;
-    logf (LOG_DEBUG, " dividend=%d", 60*score);
-    logf (LOG_DEBUG, " divisor=%d", si->no_rank_entries * log2_int (4+si->last_pos));
-    score = (60 * score)/(si->no_rank_entries * log2_int (4+si->last_pos));
+	if (si->entries[i].rank_flag && (lo = si->entries[i].local_occur))
+	    score += (8+log2_int (lo)) * si->entries[i].global_inv;
+    score *= 34;
+    divisor = si->no_rank_entries * (8+log2_int (si->last_pos/si->no_entries));
+    score = score / divisor;
+    if (score > 1000)
+	score = 1000;
     for (i = 0; i < si->no_entries; i++)
 	si->entries[i].local_occur = 0;
     return score;