X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=6dc39830972fa0245e2006a4730d78bb286960c1;hb=647212270fdb2030f6a1ab1f9880874f531847b2;hp=7eafe1ded6c3d6499d7685a7b94148a010045dfa;hpb=deff57cfa9d9b39c4a4f1c9b82a64c6e61d821a4;p=idzebra-moved-to-github.git diff --git a/rset/rsisamc.c b/rset/rsisamc.c index 7eafe1d..6dc3983 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,4 +1,4 @@ -/* $Id: rsisamc.c,v 1.36 2005-03-30 09:25:24 adam Exp $ +/* $Id: rsisamc.c,v 1.37 2005-04-13 13:03:49 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -58,14 +58,14 @@ struct rset_pp_info { struct rset_isamc_info { ISAMC is; - ISAMC_P pos; + ISAM_P pos; }; static int log_level = 0; static int log_level_initialized = 0; -RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope, - ISAMC is, ISAMC_P pos, TERMID term) +RSET rsisamc_create(NMEM nmem, const struct key_control *kcontrol, int scope, + ISAMC is, ISAM_P pos, TERMID term) { RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term); struct rset_isamc_info *info; @@ -108,7 +108,7 @@ RSFD r_open (RSET ct, int flag) rfd->priv = ptinfo; ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size); } - ptinfo->pt = isc_pp_open(info->is, info->pos); + ptinfo->pt = isamc_pp_open(info->is, info->pos); return rfd; } @@ -116,7 +116,7 @@ static void r_close (RSFD rfd) { struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv); - isc_pp_close(p->pt); + isamc_pp_close(p->pt); rfd_delete_base(rfd); } @@ -125,7 +125,7 @@ static int r_read (RSFD rfd, void *buf, TERMID *term) { struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv); int r; - r = isc_pp_read(p->pt, buf); + r = isamc_pp_read(p->pt, buf); if (term) *term = rfd->rset->term; yaz_log(log_level, "isamc.r_read");