X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frset.c;h=0691af14eca8fbda4624f448678002577309382e;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=51df9063131f03434ec412dde831b003378fc21d;hpb=70effaa5a4a18f1bef9c6111dc082bb8714e4c19;p=idzebra-moved-to-github.git

diff --git a/rset/rset.c b/rset/rset.c
index 51df906..0691af1 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.29 2004-08-31 10:43:39 heikki Exp $
+/* $Id: rset.c,v 1.38 2004-10-22 11:33:29 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -66,12 +66,14 @@ void rfd_delete_base(RSFD rfd)
     rs->free_list=rfd;
 }
 
-RSET rset_create_base(const struct rset_control *sel, NMEM nmem)
-        /* FIXME - Add keysize and cmp function */
-        /* FIXME - Add a general key-func block for cmp, dump, etc */
+
+RSET rset_create_base(const struct rset_control *sel, 
+                      NMEM nmem, const struct key_control *kcontrol,
+                      int scope, TERMID term)
 {
     RSET rnew;
     NMEM M;
+    /* assert(nmem); */ /* can not yet be used, api/t4 fails */
     if (nmem) 
         M=nmem;
     else
@@ -84,10 +86,14 @@ RSET rset_create_base(const struct rset_control *sel, NMEM nmem)
     else 
         rnew->my_nmem=1;
     rnew->control = sel;
-    rnew->count = 1;
+    rnew->count = 1; /* refcount! */
     rnew->priv = 0;
     rnew->free_list=NULL;
-    
+    rnew->keycontrol=kcontrol;
+    rnew->scope=scope;
+    rnew->term=term;
+    if (term)
+        term->rset=rnew;
     return rnew;
 }
 
@@ -122,21 +128,20 @@ void rset_default_pos (RSFD rfd, double *current, double *total)
 } /* rset_default_pos */
 #endif
 
-int rset_default_forward(RSFD rfd, void *buf, 
-                           int (*cmpfunc)(const void *p1, const void *p2), 
+int rset_default_forward(RSFD rfd, void *buf, TERMID *term,
                            const void *untilbuf)
 {
     int more=1;
-    int cmp=2;
+    int cmp=rfd->rset->scope;
     logf (LOG_DEBUG, "rset_default_forward starting '%s' (ct=%p rfd=%p)",
                     rfd->rset->control->desc, rfd->rset, rfd);
     /* key_logdump(LOG_DEBUG, untilbuf); */
-    while ( (cmp==2) && (more))
+    while ( (cmp>=rfd->rset->scope) && (more))
     {
         logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp);
-        more=rset_read(rfd, buf);
+        more=rset_read(rfd, buf, term);
         if (more)
-            cmp=(*cmpfunc)(untilbuf,buf);
+            cmp=(rfd->rset->keycontrol->cmp)(untilbuf,buf);
 /*        if (more)
             key_logdump(LOG_DEBUG,buf); */
     }
@@ -145,3 +150,66 @@ int rset_default_forward(RSFD rfd, void *buf,
     return more;
 }
 
+/** 
+ * rset_count uses rset_pos to get the total and returns that.
+ * This is ok for rsisamb, and for some other rsets, but in case of
+ * booleans etc it will give bad estimate, as nothing has been read
+ * from that rset
+ */
+zint rset_count(RSET rs)
+{
+    double cur,tot;
+    RSFD rfd=rset_open(rs,0);
+    rset_pos(rfd,&cur,&tot);
+    rset_close(rfd);
+    return (zint)(tot);
+}
+
+
+/** rset_get_no_terms is a getterms function for those that don't have any */
+void rset_get_no_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
+{
+    return;
+}
+
+/* rset_get_one_term gets that one term from an rset. Used by rsisamX */
+void rset_get_one_term(RSET ct,TERMID *terms,int maxterms,int *curterm)
+{
+    if (ct->term)
+    {
+        if (*curterm < maxterms)
+            terms[*curterm]=ct->term;
+        (*curterm)++;
+    }
+}
+
+
+TERMID rset_term_create (const char *name, int length, const char *flags,
+                                    int type, NMEM nmem)
+
+{
+    TERMID t;
+    logf (LOG_DEBUG, "term_create '%s' %d f=%s type=%d nmem=%p",
+            name, length, flags, type, nmem);
+    t= (TERMID) nmem_malloc (nmem, sizeof(*t));
+    if (!name)
+        t->name = NULL;
+    else if (length == -1)
+        t->name = nmem_strdup(nmem,name);
+    else
+    {
+        t->name = (char*) nmem_malloc(nmem,length+1);
+        memcpy (t->name, name, length);
+        t->name[length] = '\0';
+    }
+    if (!flags)
+        t->flags = NULL;
+    else
+        t->flags = nmem_strdup(nmem,flags);
+    t->type = type;
+    t->rankpriv=0;
+    t->rset=0;
+    return t;
+}
+
+