X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frset.c;h=d6bab13a51956106ffb66369323386dd6c7cf2e3;hp=b86b9817c1bbf2a7f395d0ca2a22ce2ce37cab25;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hpb=e127268c91736bf5a116cbc24653da4b845ca046

diff --git a/rset/rset.c b/rset/rset.c
index b86b981..d6bab13 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rset.c,v $
- * Revision 1.9  1996-10-29 13:55:21  adam
+ * Revision 1.14  1999-05-26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.13  1999/02/02 14:51:33  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.12  1998/04/26 10:56:57  adam
+ * Added include of string.h.
+ *
+ * Revision 1.11  1998/03/05 08:36:28  adam
+ * New result set model.
+ *
+ * Revision 1.10  1998/02/10 11:56:46  adam
+ * Implemented rset_dup.
+ *
+ * Revision 1.9  1996/10/29 13:55:21  adam
  * Include of zebrautl.h instead of alexutil.h.
  *
  * Revision 1.8  1995/12/11 09:15:23  adam
@@ -41,24 +56,91 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <zebrautl.h>
 
 #include <rset.h>
 
-RSET rset_create(const rset_control *sel, void *parms)
+RSET rset_create(const struct rset_control *sel, void *parms)
 {
     RSET rnew;
+    int i;
 
     logf (LOG_DEBUG, "rs_create(%s)", sel->desc);
-    rnew = xmalloc(sizeof(*rnew));
+    rnew = (RSET) xmalloc(sizeof(*rnew));
     rnew->control = sel;
     rnew->flags = 0;
-    rnew->buf = (*sel->f_create)(sel, parms, &rnew->flags);
+    rnew->count = 1;
+    rnew->rset_terms = NULL;
+    rnew->no_rset_terms = 0;
+    rnew->buf = (*sel->f_create)(rnew, sel, parms);
+    logf (LOG_DEBUG, "no_rset_terms: %d", rnew->no_rset_terms);
+    for (i = 0; i<rnew->no_rset_terms; i++)
+	logf (LOG_DEBUG, " %s", rnew->rset_terms[i]->name);
     return rnew;
 }
 
 void rset_delete (RSET rs)
 {
-    (*rs->control->f_delete)(rs);
-    xfree(rs);
+    (rs->count)--;
+    if (!rs->count)
+    {
+	(*rs->control->f_delete)(rs);
+	xfree(rs);
+    }
+}
+
+RSET rset_dup (RSET rs)
+{
+    (rs->count)++;
+    return rs;
+}
+
+RSET_TERM *rset_terms(RSET rs, int *no)
+{
+    *no = rs->no_rset_terms;
+    return rs->rset_terms;
+}
+
+RSET_TERM rset_term_create (const char *name, int length, const char *flags)
+{
+    RSET_TERM t = (RSET_TERM) xmalloc (sizeof(*t));
+    if (!name)
+	t->name = NULL;
+    else if (length == -1)
+	t->name = xstrdup (name);
+    else
+    {
+	t->name = (char*) xmalloc (length+1);
+	memcpy (t->name, name, length);
+	t->name[length] = '\0';
+    }
+    if (!flags)
+	t->flags = NULL;
+    else
+	t->flags = xstrdup (flags);
+    t->nn = 1;
+    return t;
+}
+
+void rset_term_destroy (RSET_TERM t)
+{
+    xfree (t->name);
+    xfree (t->flags);
+    xfree (t);
+}
+
+RSET_TERM rset_term_dup (RSET_TERM t)
+{
+    RSET_TERM nt = (RSET_TERM) xmalloc (sizeof(*nt));
+    if (t->name)
+	nt->name = xstrdup (t->name);
+    else
+	nt->name = NULL;
+    if (t->flags)
+	nt->flags = xstrdup (t->flags);
+    else
+	nt->flags = NULL;
+    nt->nn = t->nn;
+    return nt;
 }