X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=d005fb9f976705291645f69afdcf1fbb5a1cd027;hb=3335cd5f7e7af06ac6ed943859c473e092d559a1;hp=cd8d9ddbbf4cd90aa8fefb830c62e170d7f2a8bb;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index cd8d9dd..d005fb9 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,45 +1,39 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisamc.c,v $
- * 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
- * Compressed isam fully supported.
- *
- * Revision 1.1  1996/10/29 13:41:48  adam
- * First use of isamc.
- *
- */
+/* $Id: rsisamc.c,v 1.17 2004-08-06 12:55:03 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   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 <assert.h>
-#include <rsisamc.h>
+#include <string.h>
 #include <zebrautl.h>
+#include <rsisamc.h>
 
 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, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
 
@@ -51,7 +45,8 @@ static const struct rset_control control =
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward,
+    rset_default_pos,
     r_read,
     r_write,
 };
@@ -62,11 +57,15 @@ struct rset_pp_info {
     ISAMC_PP pt;
     struct rset_pp_info *next;
     struct rset_isamc_info *info;
+    zint *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;
 };
 
@@ -79,6 +78,8 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
     info = (struct rset_isamc_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
     info->pos = pt->pos;
+    info->key_size = pt->key_size;
+    info->cmp = pt->cmp;
     info->ispt_list = NULL;
     ct->no_rset_terms = 1;
     ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
@@ -104,6 +105,9 @@ RSFD r_open (RSET ct, int flag)
     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;
 }
 
@@ -115,6 +119,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);
@@ -141,15 +146,21 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
-
 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)