X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=96f638643c1924287d69a4a2f930f4979161590f;hb=f1a944fbdac20e88bf55918f2a4f66c301d684e2;hp=42b6c526a9c5207239eaaf61c6e57d5b55979f02;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 42b6c52..96f6386 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisamc.c,v $
- * Revision 1.6  1999-02-02 14:51:35  adam
+ * Revision 1.9  2002-03-20 20:24:30  adam
+ * Hits per term. Returned in SearchResult-1
+ *
+ * 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
@@ -26,10 +35,12 @@
  *
  */
 
+
 #include <stdio.h>
 #include <assert.h>
-#include <rsisamc.h>
 #include <zebrautl.h>
+#if ZMBOL
+#include <rsisamc.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
@@ -59,33 +70,40 @@ struct rset_pp_info {
     ISAMC_PP pt;
     struct rset_pp_info *next;
     struct rset_isamc_info *info;
+    int *countp;
+    void *buf;
 };
 
 struct rset_isamc_info {
     ISAMC   is;
     ISAMC_P pos;
+    int key_size;
+    int (*cmp)(const void *p1, const void *p2);
     struct rset_pp_info *ispt_list;
 };
 
 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;
 
     ct->flags |= RSET_FLAG_VOLATILE;
-    info = xmalloc (sizeof(*info));
+    info = (struct rset_isamc_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
     info->pos = pt->pos;
+    info->key_size = pt->key_size;
+    yaz_log (LOG_LOG, "info->key_size = %d\n", info->key_size);
+    info->cmp = pt->cmp;
     info->ispt_list = NULL;
     ct->no_rset_terms = 1;
-    ct->rset_terms = xmalloc (sizeof(*ct->rset_terms));
+    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");
@@ -94,13 +112,16 @@ 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);
+    ct->rset_terms[0]->count = 0;
+    ptinfo->countp = &ct->rset_terms[0]->count;
+    ptinfo->buf = xmalloc (info->key_size);
     return ptinfo;
 }
 
@@ -112,6 +133,7 @@ static void r_close (RSFD rfd)
     for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next)
         if (*ptinfop == rfd)
         {
+            xfree ((*ptinfop)->buf);
             isc_pp_close ((*ptinfop)->pt);
             *ptinfop = (*ptinfop)->next;
             xfree (rfd);
@@ -123,7 +145,7 @@ 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);
@@ -145,8 +167,19 @@ static int r_count (RSET ct)
 
 static int r_read (RSFD rfd, void *buf, int *term_index)
 {
+    struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+    int r;
     *term_index = 0;
-    return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
+    r = isc_pp_read(pinfo->pt, buf);
+    if (r > 0)
+    {
+        if (*pinfo->countp == 0 || (*pinfo->info->cmp)(buf, pinfo->buf) > 1)
+        {
+            memcpy (pinfo->buf, buf, pinfo->info->key_size);
+            (*pinfo->countp)++;
+        }
+    }
+    return r;
 }
 
 static int r_write (RSFD rfd, const void *buf)
@@ -154,3 +187,4 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }
+#endif