Improved installation. Updated for inclusion of YAZ header files.

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

diff --git a/rset/rsisam.c b/rset/rsisam.c
index 9eb27cc..92e6f4c 100644 (file)
--- a/rset/rsisam.c
+++ b/rset/rsisam.c
@@ -1,10 +1,30 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisam.c,v $
- * Revision 1.15  1996-10-29 13:55:22  adam
+ * Revision 1.21  1999-11-30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.20  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.19  1999/02/02 14:51:34  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.18  1998/03/05 08:36:28  adam
+ * New result set model.
+ *
+ * Revision 1.17  1997/12/18 10:54:25  adam
+ * New method result set method rs_hits that returns the number of
+ * hits in result-set (if known). The ranked result set returns real
+ * number of hits but only when not combined with other operands.
+ *
+ * Revision 1.16  1997/10/31 12:37:01  adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.15  1996/10/29 13:55:22  adam
  * Include of zebrautl.h instead of alexutil.h.
  *
  * Revision 1.14  1995/12/11 09:15:24  adam
@@ -55,24 +75,22 @@
  * Work
  *
  */
-
 #include <stdio.h>
 #include <assert.h>
-#include <rsisam.h>
 #include <zebrautl.h>
+#if ZMBOL
+#include <rsisam.h>
 
-static void *r_create(const struct rset_control *sel, void *parms,
-                      int *flags);
+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",
     r_create,
@@ -83,10 +101,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;
@@ -100,23 +117,26 @@ struct rset_isam_info {
     struct rset_ispt_info *ispt_list;
 };
 
-static void *r_create(const struct rset_control *sel, void *parms,
-                      int *flags)
+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;
 
-    *flags |= RSET_FLAG_VOLATILE;
-    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");
@@ -125,11 +145,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;
 }
 
@@ -143,7 +166,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!");
@@ -152,10 +175,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);
 }
 
@@ -170,8 +195,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);
 }
 
@@ -180,9 +206,4 @@ 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;
-}
+#endif