Creating search terms, and passing them around in searches. Not yet actually

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

diff --git a/index/zsets.c b/index/zsets.c
index aa2d16d..c0d6ce9 100644 (file)
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,4 +1,4 @@
-/* $Id: zsets.c,v 1.58 2004-08-30 12:32:24 heikki Exp $
+/* $Id: zsets.c,v 1.64 2004-10-20 14:32:28 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -30,7 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #include "index.h"
-#include <rstemp.h>
+#include <rset.h>
 
 #define SORT_IDX_ENTRYSIZE 64
 #define ZSET_SORT_MAX_LEVEL 3
@@ -206,6 +206,8 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov)
             return NULL;
         if (s->rset)
             rset_delete (s->rset);
+        if (s->rset_nmem)
+            nmem_destroy (s->rset_nmem);
         if (s->nmem)
             nmem_destroy (s->nmem);
     }
@@ -256,6 +258,8 @@ ZebraSet resultSetGet (ZebraHandle zh, const char *name)
             {
                 NMEM nmem = nmem_create ();
                 yaz_log (LOG_LOG, "research %s", name);
+                if (!s->rset_nmem)
+                    s->rset_nmem=nmem_create();
                 s->rset =
                     rpn_search (zh, nmem, s->rset_nmem, s->rpn, s->num_bases,
                                 s->basenames, s->name, s);
@@ -403,13 +407,9 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
             while (num_i < num && positions[num_i] < position)
                 num_i++;
             rfd = rset_open (rset, RSETF_READ);
-            while (num_i < num && rset_read (rset, rfd, &key))
+            while (num_i < num && rset_read (rfd, &key, 0))
             {
-#if IT_KEY_NEW
                 zint this_sys = key.mem[0];
-#else
-                zint this_sys = key.sysno;
-#endif
                 if (this_sys != psysno)
                 {
                     psysno = this_sys;
@@ -433,7 +433,7 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
                     }
                 }
             }
-            rset_close (rset, rfd);
+            rset_close (rfd);
         }
     }
     return sr;
@@ -690,13 +690,10 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
         }
     }
     rfd = rset_open (rset, RSETF_READ);
-    while (rset_read (rset, rfd, &key))
+    while (rset_read (rfd, &key,0))
+      /* FIXME - pass a TERMID *, and use it for something below !! */
     {
-#if IT_KEY_NEW
         zint this_sys = key.mem[0];
-#else
-        zint this_sys = key.sysno;
-#endif
         if (this_sys != psysno)
         {
             (sset->hits)++;
@@ -705,7 +702,7 @@ void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
                                  sort_criteria, num_criteria, psysno);
         }
     }
-    rset_close (rset, rfd);
+    rset_close (rfd);
    
 #if 0
     for (i = 0; i < rset->no_rset_terms; i++)
@@ -750,8 +747,6 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
     zebraSet->hits = 0;
     rfd = rset_open (rset, RSETF_READ);
 
-    yaz_log (LOG_LOG, "resultSetRank");
-
     rank_class = zebraRankLookup (zh, rank_handler_name);
     if (!rank_class)
     {
@@ -760,13 +755,10 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
     }
     rc = rank_class->control;
 
-    if (rset_read (rset, rfd, &key))
+    if (rset_read (rfd, &key, 0))
+        /* FIXME - Pass a TERMID *, and use it for something ?? */
     {
-#if IT_KEY_NEW
         zint psysno = key.mem[0];
-#else
-        zint psysno = key.sysno;
-#endif
         int score;
         void *handle =
             (*rc->begin) (zh->reg, rank_class->class_handle, rset);
@@ -776,11 +768,7 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
             est=-1; /* can not do */
         do
         {
-#if IT_KEY_NEW
             zint this_sys = key.mem[0];
-#else
-            zint this_sys = key.sysno;
-#endif
             kno++;
             if (this_sys != psysno)
             {
@@ -794,35 +782,35 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
             /* term lists! */
             /* (*rc->add) (handle, this_sys, term_index); */
             
-        if ( (est==-2) && (zebraSet->hits==esthits))
-        { /* time to estimate the hits */
-            rset_pos(rset,rfd,&cur,&tot); 
-            if (tot>0) {
-                ratio=cur/tot;
-                est=(zint)(0.5+zebraSet->hits/ratio);
-                logf(LOG_LOG, "Estimating hits (%s) "
-                              "%0.1f->"ZINT_FORMAT
-                              "; %0.1f->"ZINT_FORMAT,
-                              rset->control->desc,
-                              cur, zebraSet->hits,
-                              tot,est);
-                i=0; /* round to 3 significant digits */
-                while (est>1000) {
-                    est/=10;
-                    i++;
+            if ( (est==-2) && (zebraSet->hits==esthits))
+            { /* time to estimate the hits */
+                rset_pos(rfd,&cur,&tot); 
+                if (tot>0) {
+                    ratio=cur/tot;
+                    est=(zint)(0.5+zebraSet->hits/ratio);
+                    logf(LOG_LOG, "Estimating hits (%s) "
+                                  "%0.1f->"ZINT_FORMAT
+                                  "; %0.1f->"ZINT_FORMAT,
+                                  rset->control->desc,
+                                  cur, zebraSet->hits,
+                                  tot,est);
+                    i=0; /* round to 3 significant digits */
+                    while (est>1000) {
+                        est/=10;
+                        i++;
+                    }
+                    while (i--) est*=10;
+                    zebraSet->hits=est;
                 }
-                while (i--) est*=10;
-                zebraSet->hits=est;
             }
         }
-        }
-        while (rset_read (rset, rfd, &key) && (est<0) );
-           
+        while (rset_read (rfd, &key,0) && (est<0) );
+           /* FIXME - term ?? */
         score = (*rc->calc) (handle, psysno);
         resultSetInsertRank (zh, sort_info, psysno, score, 'A');
         (*rc->end) (zh->reg, handle);
     }
-    rset_close (rset, rfd);
+    rset_close (rfd);
 /*
     for (i = 0; i < rset->no_rset_terms; i++)
     {
@@ -837,7 +825,7 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
                  rset->rset_terms[i]->count);
     }
 */
-    yaz_log (LOG_LOG, ZINT_FORMAT " keys, "ZINT_FORMAT" distinct sysnos", 
+    yaz_log (LOG_DEBUG, ZINT_FORMAT " keys, "ZINT_FORMAT" distinct sysnos", 
                     kno, zebraSet->hits);
 }