X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisamc.c;h=76c97021b903d547769be9b3344ceda837f64213;hp=b67839f77212283e7fbf365a6ce7f550c7af0120;hb=e150e51a7e20a902e9fd2f11f00811f94f67d529;hpb=b7942589b21cca1b6d44c7bf9446dcb6a5942953

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index b67839f..76c9702 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,10 +1,27 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisamc.c,v $
- * Revision 1.3  1997-10-31 12:37:01  adam
+ * Revision 1.8  1999-11-30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.7  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.6  1999/02/02 14:51:35  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.5  1998/03/05 08:36:28  adam
+ * New result set model.
+ *
+ * Revision 1.4  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.3  1997/10/31 12:37:01  adam
  * Code calls xfree() instead of free().
  *
  * Revision 1.2  1996/11/08 11:15:57  adam
@@ -15,23 +32,23 @@
  *
  */
 
+
 #include <stdio.h>
 #include <assert.h>
-#include <rsisamc.h>
 #include <zebrautl.h>
+#if ZMBOL
+#include <rsisamc.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 = 
 {
     "isamc",
     r_create,
@@ -42,10 +59,9 @@ static const rset_control control =
     r_count,
     r_read,
     r_write,
-    r_score
 };
 
-const rset_control *rset_kind_isamc = &control;
+const struct rset_control *rset_kind_isamc = &control;
 
 struct rset_pp_info {
     ISAMC_PP pt;
@@ -59,23 +75,25 @@ struct rset_isamc_info {
     struct rset_pp_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_isamc_parms *pt = parms;
+    rset_isamc_parms *pt = (rset_isamc_parms *) parms;
     struct rset_isamc_info *info;
 
-    *flags |= RSET_FLAG_VOLATILE;
-    info = xmalloc (sizeof(*info));
+    ct->flags |= RSET_FLAG_VOLATILE;
+    info = (struct rset_isamc_info *) xmalloc (sizeof(*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_isamc_info *info = ct->buf;
+    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf;
     struct rset_pp_info *ptinfo;
 
     logf (LOG_DEBUG, "risamc_open");
@@ -84,11 +102,13 @@ RSFD r_open (RSET ct, int flag)
 	logf (LOG_FATAL, "ISAMC set type is read-only");
 	return NULL;
     }
-    ptinfo = xmalloc (sizeof(*ptinfo));
+    ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
     ptinfo->next = info->ispt_list;
     info->ispt_list = ptinfo;
     ptinfo->pt = isc_pp_open (info->is, info->pos);
     ptinfo->info = info;
+    if (ct->rset_terms[0]->nn < 0)
+	ct->rset_terms[0]->nn = isc_pp_num (ptinfo->pt);
     return ptinfo;
 }
 
@@ -111,10 +131,12 @@ static void r_close (RSFD rfd)
 
 static void r_delete (RSET ct)
 {
-    struct rset_isamc_info *info = ct->buf;
+    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf;
 
     logf (LOG_DEBUG, "rsisamc_delete");
     assert (info->ispt_list == NULL);
+    rset_term_destroy (ct->rset_terms[0]);
+    xfree (ct->rset_terms);
     xfree (info);
 }
 
@@ -129,8 +151,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 isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
 }
 
@@ -139,9 +162,4 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }
-
-static int r_score (RSFD rfd, int *score)
-{
-    *score = -1;
-    return -1;
-}
+#endif