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

[idzebra-moved-to-github.git] / rset / rset.c

diff --git a/rset/rset.c b/rset/rset.c
index 6f7c342..a7c2ffe 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.32 2004-09-03 14:59:50 heikki Exp $
+/* $Id: rset.c,v 1.35 2004-10-20 14:32:29 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -68,7 +68,8 @@ void rfd_delete_base(RSFD rfd)
 
 
 RSET rset_create_base(const struct rset_control *sel, 
-                      NMEM nmem, const struct key_control *kcontrol)
+                      NMEM nmem, const struct key_control *kcontrol,
+                      int scope, TERMID term)
 {
     RSET rnew;
     NMEM M;
@@ -89,6 +90,8 @@ RSET rset_create_base(const struct rset_control *sel,
     rnew->priv = 0;
     rnew->free_list=NULL;
     rnew->keycontrol=kcontrol;
+    rnew->scope=scope;
+    rnew->term=term;
     return rnew;
 }
 
@@ -123,18 +126,18 @@ void rset_default_pos (RSFD rfd, double *current, double *total)
 } /* rset_default_pos */
 #endif
 
-int rset_default_forward(RSFD rfd, void *buf, 
+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=(rfd->rset->keycontrol->cmp)(untilbuf,buf);
 /*        if (more)
@@ -145,3 +148,32 @@ int rset_default_forward(RSFD rfd, void *buf,
     return more;
 }
 
+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->nn = -1;
+    t->count = 0;
+    t->type = type;
+    return t;
+}
+
+