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

diff --git a/index/rank1.c b/index/rank1.c
index d947684..48a4ada 100644
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rank1.c,v $
- * Revision 1.6  2000-03-15 15:00:30  adam
+ * Revision 1.9  2002-04-11 11:39:59  heikki
+ * Removed to logf calls from tight inside loops
+ *
+ * Revision 1.8  2002/04/04 14:14:13  adam
+ * Multiple registers (alpha early)
+ *
+ * Revision 1.7  2001/11/14 22:06:27  adam
+ * Rank-weight may be controlled via query.
+ *
+ * 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
@@ -33,7 +42,7 @@
 #include <unistd.h>
 #endif
 
-#include "zserver.h"
+#include "index.h"
 
 struct rank_class_info {
     int dummy;
@@ -44,6 +53,7 @@ struct rank_term_info {
     int global_occur;
     int global_inv;
     int rank_flag;
+    int rank_weight;
 };
 
 struct rank_set_info {
@@ -65,7 +75,7 @@ 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 (ZebraService zh)
+static void *create (struct zebra_register *reg)
 {
     struct rank_class_info *ci = (struct rank_class_info *)
 	xmalloc (sizeof(*ci));
@@ -79,7 +89,7 @@ static void *create (ZebraService 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 (ZebraService zh, void *class_handle)
+static void destroy (struct zebra_register *reg, void *class_handle)
 {
     struct rank_class_info *ci = (struct rank_class_info *) class_handle;
 
@@ -93,7 +103,7 @@ static void destroy (ZebraService zh, void *class_handle)
  *  each result set. The returned handle is a "set handle" and
  *  will be used in each of the handlers below.
  */
-static void *begin (ZebraHandle zh, void *class_handle, RSET rset)
+static void *begin (struct zebra_register *reg, void *class_handle, RSET rset)
 {
     struct rank_set_info *si = (struct rank_set_info *) xmalloc (sizeof(*si));
     int i;
@@ -106,9 +116,12 @@ static void *begin (ZebraHandle zh, void *class_handle, RSET rset)
     for (i = 0; i < si->no_entries; i++)
     {
 	int g = rset->rset_terms[i]->nn;
-	if (!strcmp (rset->rset_terms[i]->flags, "rank"))
+	if (!strncmp (rset->rset_terms[i]->flags, "rank,", 5))
 	{
+            yaz_log (LOG_LOG, "%s", rset->rset_terms[i]->flags);
 	    si->entries[i].rank_flag = 1;
+            si->entries[i].rank_weight = atoi (rset->rset_terms[i]->flags+5);
+            yaz_log (LOG_LOG, "i=%d weight=%d", i, si->entries[i].rank_weight);
 	    (si->no_rank_entries)++;
 	}
 	else
@@ -125,7 +138,7 @@ static void *begin (ZebraHandle zh, void *class_handle, RSET rset)
  * end: Terminates ranking process. Called after a result set
  *  has been ranked.
  */
-static void end (ZebraHandle zh, void *set_handle)
+static void end (struct zebra_register *reg, void *set_handle)
 {
     struct rank_set_info *si = (struct rank_set_info *) set_handle;
     logf (LOG_DEBUG, "rank-1 end");
@@ -141,7 +154,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 = (struct rank_set_info *) set_handle;
-    logf (LOG_DEBUG, "rank-1 add seqno=%d term_index=%d", seqno, term_index);
+    /*logf (LOG_DEBUG, "rank-1 add seqno=%d term_index=%d", seqno, term_index);*/
     si->last_pos = seqno;
     si->entries[term_index].local_occur++;
 }
@@ -157,16 +170,16 @@ static int calc (void *set_handle, int sysno)
     int i, lo, divisor, score = 0;
     struct rank_set_info *si = (struct rank_set_info *) set_handle;
 
-    logf (LOG_DEBUG, "rank-1 calc sysno=%d", sysno);
-
     if (!si->no_rank_entries)
 	return -1;
+
     for (i = 0; i < si->no_entries; i++)
 	if (si->entries[i].rank_flag && (lo = si->entries[i].local_occur))
-	    score += (8+log2_int (lo)) * si->entries[i].global_inv;
-    score *= 34;
+	    score += (8+log2_int (lo)) * si->entries[i].global_inv *
+                si->entries[i].rank_weight;
     divisor = si->no_rank_entries * (8+log2_int (si->last_pos/si->no_entries));
     score = score / divisor;
+    yaz_log (LOG_LOG, "sysno=%d score=%d", sysno, score);
     if (score > 1000)
 	score = 1000;
     for (i = 0; i < si->no_entries; i++)