Re-estabslished rank-1. Gets same order of results, but slightly different

[idzebra-moved-to-github.git] / index / zsets.c

diff --git a/index/zsets.c b/index/zsets.c
index c0d6ce9..efe14c7 100644 (file)
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.64 2004-10-20 14:32:28 heikki Exp $
+/* $Id: zsets.c,v 1.69 2004-10-26 15:32:11 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -89,7 +89,7 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m,
     zebraSet->locked = 1;
     zebraSet->rpn = 0;
     zebraSet->nmem = m;
-    zebraSet->rset_nmem=nmem_create(); /* FIXME - where to free this ?? */
+    zebraSet->rset_nmem=nmem_create(); 
 
     zebraSet->num_bases = num_bases;
     zebraSet->basenames = 
@@ -625,6 +625,7 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
     struct sortKeyInfo sort_criteria[3];
     int num_criteria;
     RSFD rfd;
+    TERMID termid;
 
     yaz_log (LOG_LOG, "resultSetSortSingle start");
     assert(nmem); /* compiler shut up about unused param */
@@ -690,7 +691,7 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
         }
     }
     rfd = rset_open (rset, RSETF_READ);
-    while (rset_read (rfd, &key,0))
+    while (rset_read (rfd, &key,&termid))
       /* FIXME - pass a TERMID *, and use it for something below !! */
     {
         zint this_sys = key.mem[0];
@@ -726,13 +727,15 @@ RSET resultSetRef (ZebraHandle zh, const char *resultSetId)
     return NULL;
 }
 
-void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
+void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem)
 {
     zint kno = 0;
     struct it_key key;
     RSFD rfd;
-    /* int term_index; */
-    int i;
+    TERMID termid;
+    TERMID *terms;
+    int numterms;
+    int i,n;
     ZebraRankClass rank_class;
     struct rank_control *rc;
     struct zset_sort_info *sort_info;
@@ -745,6 +748,12 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
     sort_info = zebraSet->sort_info;
     sort_info->num_entries = 0;
     zebraSet->hits = 0;
+    n=0;
+    rset_getterms(rset,0,0,&n);
+    terms=malloc( sizeof(*terms)*n);
+    numterms=0;
+    rset_getterms(rset,terms,n,&numterms);
+
     rfd = rset_open (rset, RSETF_READ);
 
     rank_class = zebraRankLookup (zh, rank_handler_name);
@@ -755,20 +764,21 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
     }
     rc = rank_class->control;
 
-    if (rset_read (rfd, &key, 0))
-        /* FIXME - Pass a TERMID *, and use it for something ?? */
+    if (rset_read (rfd, &key, &termid))
     {
         zint psysno = key.mem[0];
         int score;
         void *handle =
-            (*rc->begin) (zh->reg, rank_class->class_handle, rset);
+            (*rc->begin) (zh->reg, rank_class->class_handle, rset, nmem,
+                          terms, numterms);
         (zebraSet->hits)++;
         esthits=atoi(res_get_def(zh->res,"estimatehits","0"));
         if (!esthits) 
             est=-1; /* can not do */
         do
         {
-            zint this_sys = key.mem[0];
+            zint this_sys = key.mem[0]; /* FIXME - assumes scope==2 */
+            zint seqno = key.mem[1]; /* FIXME - assumes scope==2 */
             kno++;
             if (this_sys != psysno)
             {
@@ -778,9 +788,7 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
                 (zebraSet->hits)++;
                 psysno = this_sys;
             }
-            /* FIXME - Ranking is broken, since rsets no longer have */
-            /* term lists! */
-            /* (*rc->add) (handle, this_sys, term_index); */
+            (*rc->add) (handle, seqno, termid);
             
             if ( (est==-2) && (zebraSet->hits==esthits))
             { /* time to estimate the hits */
@@ -804,27 +812,22 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
                 }
             }
         }
-        while (rset_read (rfd, &key,0) && (est<0) );
-           /* FIXME - term ?? */
+        while (rset_read (rfd, &key,&termid) && (est<0) );
         score = (*rc->calc) (handle, psysno);
         resultSetInsertRank (zh, sort_info, psysno, score, 'A');
         (*rc->end) (zh->reg, handle);
     }
     rset_close (rfd);
-/*
-    for (i = 0; i < rset->no_rset_terms; i++)
+
+
+    for (i = 0; i < numterms; i++)
     {
-        if (est>0)
-            rset->rset_terms[i]->count = 
-                est=(zint)(rset->rset_terms[i]->count/ratio);
-        yaz_log (LOG_LOG, "term=\"%s\" nn=" ZINT_FORMAT 
+        yaz_log (LOG_LOG, "term=\"%s\" "
                     " type=%s count=" ZINT_FORMAT,
-                 rset->rset_terms[i]->name,
-                 rset->rset_terms[i]->nn,
-                 rset->rset_terms[i]->flags,
-                 rset->rset_terms[i]->count);
+                 terms[i]->name,
+                 terms[i]->flags,
+                 rset_count(terms[i]->rset));
     }
-*/
     yaz_log (LOG_DEBUG, ZINT_FORMAT " keys, "ZINT_FORMAT" distinct sysnos", 
                     kno, zebraSet->hits);
 }