X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisam.c;h=bbb3859be9299c0ab5b7cd712ee7d4b5a6d47afb;hb=a20e59c5087fb92c419f2330c786367f9ce8ccd2;hp=249a7636622a775ef2d07ef16a199c54f6265801;hpb=5c7ad71f534d092eaf97f04dd39c5e874e0d45b0;p=idzebra-moved-to-github.git

diff --git a/rset/rsisam.c b/rset/rsisam.c
index 249a763..bbb3859 100644
--- a/rset/rsisam.c
+++ b/rset/rsisam.c
@@ -1,69 +1,26 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisam.c,v $
- * Revision 1.13  1995-10-12 12:41:56  adam
- * Private info (buf) moved from struct rset_control to struct rset.
- * Bug fixes in relevance.
- *
- * Revision 1.12  1995/10/10  14:00:04  adam
- * Function rset_open changed its wflag parameter to general flags.
- *
- * Revision 1.11  1995/10/06  14:38:05  adam
- * New result set method: r_score.
- * Local no (sysno) and score is transferred to retrieveCtrl.
- *
- * Revision 1.10  1995/09/08  14:52:42  adam
- * Work on relevance feedback.
- *
- * Revision 1.9  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.8  1995/09/06  16:11:56  adam
- * More work on boolean sets.
- *
- * Revision 1.7  1995/09/06  10:35:44  adam
- * Null set implemented.
- *
- * Revision 1.6  1995/09/05  11:43:24  adam
- * Complete version of temporary sets. Not tested yet though.
- *
- * Revision 1.5  1995/09/04  12:33:56  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.4  1995/09/04  09:10:55  adam
- * Minor changes.
- *
- * Revision 1.3  1994/11/22  13:15:37  quinn
- * Simple
- *
- * Revision 1.2  1994/11/04  14:53:12  quinn
- * Work
  *
+ * $Id: rsisam.c,v 1.22 2002-04-05 08:46:26 adam Exp $
  */
-
 #include <stdio.h>
 #include <assert.h>
+#include <zebrautl.h>
 #include <rsisam.h>
-#include <alexutil.h>
 
-static void *r_create(const struct rset_control *sel, void *parms);
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
 static int r_count (RSET ct);
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
-static int r_score (RSFD rfd, int *score);
 
-static const rset_control control = 
+static const struct rset_control control = 
 {
-    "ISAM set type",
+    "isam",
     r_create,
     r_open,
     r_close,
@@ -72,10 +29,9 @@ static const rset_control control =
     r_count,
     r_read,
     r_write,
-    r_score
 };
 
-const rset_control *rset_kind_isam = &control;
+const struct rset_control *rset_kind_isam = &control;
 
 struct rset_ispt_info {
     ISPT   pt;
@@ -89,21 +45,26 @@ struct rset_isam_info {
     struct rset_ispt_info *ispt_list;
 };
 
-static void *r_create(const struct rset_control *sel, void *parms)
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
-    rset_isam_parms *pt = parms;
+    rset_isam_parms *pt = (rset_isam_parms *) parms;
     struct rset_isam_info *info;
 
-    info = xmalloc (sizeof(struct rset_isam_info));
+    ct->flags |= RSET_FLAG_VOLATILE;
+    info = (struct rset_isam_info *) xmalloc (sizeof(struct rset_isam_info));
     info->is = pt->is;
     info->pos = pt->pos;
     info->ispt_list = NULL;
+
+    ct->no_rset_terms = 1;
+    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
+    ct->rset_terms[0] = pt->rset_term;
     return info;
 }
 
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isam_info *info = ct->buf;
+    struct rset_isam_info *info = (struct rset_isam_info *) ct->buf;
     struct rset_ispt_info *ptinfo;
 
     logf (LOG_DEBUG, "risam_open");
@@ -112,11 +73,14 @@ RSFD r_open (RSET ct, int flag)
 	logf (LOG_FATAL, "ISAM set type is read-only");
 	return NULL;
     }
-    ptinfo = xmalloc (sizeof(*ptinfo));
+    ptinfo = (struct rset_ispt_info *) xmalloc (sizeof(*ptinfo));
     ptinfo->next = info->ispt_list;
     info->ispt_list = ptinfo;
     ptinfo->pt = is_position (info->is, info->pos);
     ptinfo->info = info;
+
+    if (ct->rset_terms[0]->nn < 0)
+	ct->rset_terms[0]->nn = is_numkeys (ptinfo->pt);
     return ptinfo;
 }
 
@@ -130,7 +94,7 @@ static void r_close (RSFD rfd)
         {
             is_pt_free ((*ptinfop)->pt);
             *ptinfop = (*ptinfop)->next;
-            free (rfd);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
@@ -139,10 +103,12 @@ static void r_close (RSFD rfd)
 
 static void r_delete (RSET ct)
 {
-    struct rset_isam_info *info = ct->buf;
+    struct rset_isam_info *info = (struct rset_isam_info *) ct->buf;
 
     logf (LOG_DEBUG, "rsisam_delete");
     assert (info->ispt_list == NULL);
+    rset_term_destroy (ct->rset_terms[0]);
+    xfree (ct->rset_terms);
     xfree (info);
 }
 
@@ -157,8 +123,9 @@ static int r_count (RSET ct)
     return 0;
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, int *term_index)
 {
+    *term_index = 0;
     return is_readkey( ((struct rset_ispt_info*) rfd)->pt, buf);
 }
 
@@ -167,9 +134,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAM set type is read-only");
     return -1;
 }
-
-static int r_score (RSFD rfd, int *score)
-{
-    *score = -1;
-    return -1;
-}