* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rsisamc.c,v $
- * Revision 1.1 1996-10-29 13:41:48 adam
+ * 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.
*
*/
static int r_read (RSFD rfd, void *buf)
{
- return isc_read_key( ((struct rset_pp_info*) rfd)->pt, buf);
+ return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
}
static int r_write (RSFD rfd, const void *buf)
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rsrel.c,v $
- * Revision 1.13 1996-10-29 13:55:26 adam
+ * Revision 1.14 1996-11-08 11:15:58 adam
+ * Compressed isam fully supported.
+ *
+ * Revision 1.13 1996/10/29 13:55:26 adam
* Include of zebrautl.h instead of alexutil.h.
*
* Revision 1.12 1996/10/08 13:00:40 adam
#include <assert.h>
#include <isam.h>
+#include <isamc.h>
#include <rsrel.h>
#include <zebrautl.h>
char *isam_tmp_buf;
int *isam_r;
int *max_tf, *tf;
- ISPT *isam_pt;
+ ISPT *isam_pt = NULL;
+ ISAMC_PP *isamc_pp = NULL;
int i;
logf (LOG_DEBUG, "relevance");
isam_buf = xmalloc (parms->no_isam_positions * sizeof(*isam_buf));
isam_r = xmalloc (sizeof (*isam_r) * parms->no_isam_positions);
- isam_pt = xmalloc (sizeof (*isam_pt) * parms->no_isam_positions);
+ if (parms->is)
+ isam_pt = xmalloc (sizeof (*isam_pt) * parms->no_isam_positions);
+ else if (parms->isc)
+ isamc_pp = xmalloc (sizeof (*isamc_pp) * parms->no_isam_positions);
+ else
+ {
+ logf (LOG_FATAL, "No isamc or isam in rs_rel");
+ abort ();
+ }
isam_tmp_buf = xmalloc (info->key_size);
max_tf = xmalloc (sizeof (*max_tf) * parms->no_terms);
tf = xmalloc (sizeof (*tf) * parms->no_terms);
for (i = 0; i<parms->no_isam_positions; i++)
{
isam_buf[i] = xmalloc (info->key_size);
- isam_pt[i] = is_position (parms->is, parms->isam_positions[i]);
- max_tf [parms->term_no[i]] = is_numkeys (isam_pt[i]);
- isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+ if (isam_pt)
+ {
+ isam_pt[i] = is_position (parms->is, parms->isam_positions[i]);
+ max_tf [parms->term_no[i]] = is_numkeys (isam_pt[i]);
+ isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+ }
+ else if (isamc_pp)
+ {
+ isamc_pp[i] = isc_pp_open (parms->isc, parms->isam_positions[i]);
+ max_tf [parms->term_no[i]] = isc_pp_num (isamc_pp[i]);
+ isam_r[i] = isc_pp_read (isamc_pp[i], isam_buf[i]);
+ }
logf (LOG_DEBUG, "max tf %d = %d", i, max_tf[i]);
}
while (1)
do
{
tf[parms->term_no[i]]++;
- isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+ if (isam_pt)
+ isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+ else if (isamc_pp)
+ isam_r[i] = isc_pp_read (isamc_pp[i], isam_buf[i]);
} while (isam_r[i] &&
(*parms->cmp)(isam_buf[i], isam_tmp_buf) <= 1);
}
qsort (info->sysno_idx, info->no_rec, sizeof(*info->sysno_idx), qcomp);
for (i = 0; i<parms->no_isam_positions; i++)
{
- is_pt_free (isam_pt[i]);
+ if (isam_pt)
+ is_pt_free (isam_pt[i]);
+ if (isamc_pp)
+ isc_pp_close (isamc_pp[i]);
xfree (isam_buf[i]);
}
xfree (max_tf);
xfree (isam_buf);
xfree (isam_r);
xfree (isam_pt);
+ xfree (isamc_pp);
xfree(tf);
}