-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisamc.c,v $
- * 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
- * Compressed isam fully supported.
- *
- * Revision 1.1 1996/10/29 13:41:48 adam
- * First use of isamc.
- *
- */
+/* $Id: rsisamc.c,v 1.22 2004-08-26 11:11:59 heikki 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 <string.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);
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_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
{
"isamc",
- r_create,
r_open,
r_close,
r_delete,
r_rewind,
- r_count,
+ rset_default_forward,
+ rset_default_pos,
r_read,
r_write,
};
ISAMC_PP pt;
struct rset_pp_info *next;
struct rset_isamc_info *info;
+ 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;
+ struct rset_pp_info *free_list;
};
+RSET rsisamc_create( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ ISAMC is, ISAMC_P pos)
+{
+ RSET rnew=rset_create_base(&control, nmem);
+ struct rset_isamc_info *info;
+ info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+ info->key_size = key_size;
+ info->cmp = cmp;
+ info->ispt_list = NULL;
+ info->free_list = NULL;
+ info->is=is;
+ info->pos=pos;
+ rnew->priv=info;
+ return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+ struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
+
+ logf (LOG_DEBUG, "rsisamc_delete");
+ assert (info->ispt_list == NULL);
+}
+
+/*
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
{
rset_isamc_parms *pt = (rset_isamc_parms *) parms;
struct rset_isamc_info *info;
- ct->flags |= RSET_FLAG_VOLATILE;
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));
- ct->rset_terms[0] = pt->rset_term;
return info;
}
+*/
RSFD r_open (RSET ct, int flag)
{
- struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf;
+ struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
struct rset_pp_info *ptinfo;
logf (LOG_DEBUG, "risamc_open");
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMC set type is read-only");
- return NULL;
+ logf (LOG_FATAL, "ISAMC set type is read-only");
+ return NULL;
+ }
+ ptinfo = info->free_list;
+ if (ptinfo)
+ info->free_list=ptinfo->next;
+ else {
+ ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
+ ptinfo->buf = nmem_malloc (ct->nmem,info->key_size);
}
- 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;
}
for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next)
if (*ptinfop == rfd)
{
+ struct rset_pp_info *tmp=(struct rset_pp_info*) rfd;
isc_pp_close ((*ptinfop)->pt);
*ptinfop = (*ptinfop)->next;
- xfree (rfd);
+ tmp->next=info->free_list;
+ info->free_list=tmp;
return;
}
logf (LOG_FATAL, "r_close but no rfd match!");
assert (0);
}
-static void r_delete (RSET ct)
-{
- 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);
-}
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)
+static int r_read (RSFD rfd, void *buf)
{
- *term_index = 0;
- return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
+ struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+ int r;
+ r = isc_pp_read(pinfo->pt, buf);
+ return r;
}
static int r_write (RSFD rfd, const void *buf)
logf (LOG_FATAL, "ISAMC set type is read-only");
return -1;
}
-#endif