X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frset.c;h=66164da832f2ea8d13597bdb89bdbfd9e4fd8d1a;hb=48b764604b23e70fe0a354bdfa02dc6ff0bffced;hp=3ebde5b35d5aed8fcec2dbf5d105855e26b0d7de;hpb=33b386a95c0aac273527d596ce1aafa0dc567b7b;p=idzebra-moved-to-github.git

diff --git a/rset/rset.c b/rset/rset.c
index 3ebde5b..66164da 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,52 +1,29 @@
-/*
- * Copyright (C) 1994-1998, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rset.c,v $
- * 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
- * New set types: sand/sor/snot - ranked versions of and/or/not in
- * ranked/semi-ranked result sets.
- * Note: the snot not finished yet.
- * New rset member: flag.
- * Bug fix: r_delete in rsrel.c did free bad memory block.
- *
- * Revision 1.7  1995/10/12  12:41:56  adam
- * Private info (buf) moved from struct rset_control to struct rset.
- * Bug fixes in relevance.
- *
- * Revision 1.6  1995/09/08  14:52:41  adam
- * Work on relevance feedback.
- *
- * Revision 1.5  1995/09/07  13:58:43  adam
- * New parameter: result-set file descriptor (RSFD) to support multiple
- * positions within the same result-set.
- * Boolean operators: and, or, not implemented.
- *
- * Revision 1.4  1995/09/06  16:11:56  adam
- * More work on boolean sets.
- *
- * Revision 1.3  1995/09/04  15:20:39  adam
- * More work on temp sets. is_open member removed.
- *
- * Revision 1.2  1995/09/04  12:33:56  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.1  1994/11/04  13:21:28  quinn
- * Working.
- *
- */
+/* $Id: rset.c,v 1.17 2002-08-02 19:26:57 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <stdio.h>
+#include <string.h>
 #include <zebrautl.h>
 
 #include <rset.h>
@@ -57,7 +34,7 @@ RSET rset_create(const struct rset_control *sel, void *parms)
     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->count = 1;
@@ -92,16 +69,17 @@ RSET_TERM *rset_terms(RSET rs, int *no)
     return rs->rset_terms;
 }
 
-RSET_TERM rset_term_create (const char *name, int length, const char *flags)
+RSET_TERM rset_term_create (const char *name, int length, const char *flags,
+                            int type)
 {
-    RSET_TERM t = xmalloc (sizeof(*t));
+    RSET_TERM t = (RSET_TERM) xmalloc (sizeof(*t));
     if (!name)
 	t->name = NULL;
     else if (length == -1)
 	t->name = xstrdup (name);
     else
     {
-	t->name = xmalloc (length+1);
+	t->name = (char*) xmalloc (length+1);
 	memcpy (t->name, name, length);
 	t->name[length] = '\0';
     }
@@ -109,7 +87,9 @@ RSET_TERM rset_term_create (const char *name, int length, const char *flags)
 	t->flags = NULL;
     else
 	t->flags = xstrdup (flags);
-    t->nn = 1;
+    t->nn = -1;
+    t->count = 0;
+    t->type = type;
     return t;
 }
 
@@ -122,7 +102,7 @@ void rset_term_destroy (RSET_TERM t)
 
 RSET_TERM rset_term_dup (RSET_TERM t)
 {
-    RSET_TERM nt = xmalloc (sizeof(*nt));
+    RSET_TERM nt = (RSET_TERM) xmalloc (sizeof(*nt));
     if (t->name)
 	nt->name = xstrdup (t->name);
     else