-/* $Id: sortidx.c,v 1.7 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: sortidx.c,v 1.16 2006-05-10 08:13:22 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <string.h>
#include <yaz/log.h>
-#include <bfile.h>
+#include <yaz/xmalloc.h>
+#include <idzebra/bfile.h>
#include <sortidx.h>
+#include "recindex.h"
#define SORT_IDX_BLOCKSIZE 64
struct sortFileHead {
- int sysno_max;
+ SYSNO sysno_max;
};
struct sortFile {
struct sortIdx {
BFiles bfs;
int write_flag;
- int sysno;
+ SYSNO sysno;
char *entry_buf;
struct sortFile *current_file;
struct sortFile *files;
sf->type = type;
sf->bf = NULL;
sprintf (fname, "sort%d", type);
- logf (LOG_DEBUG, "sort idx %s wr=%d", fname, si->write_flag);
+ yaz_log (YLOG_DEBUG, "sort idx %s wr=%d", fname, si->write_flag);
sf->bf = bf_open (si->bfs, fname, SORT_IDX_BLOCKSIZE, si->write_flag);
if (!sf->bf)
{
return 0;
}
-void sortIdx_sysno (SortIdx si, int sysno)
+void sortIdx_sysno (SortIdx si, SYSNO sysno)
{
- si->sysno = sysno;
+ si->sysno = rec_sysno_to_int(sysno);
}
void sortIdx_add (SortIdx si, const char *buf, int len)
void sortIdx_read (SortIdx si, char *buf)
{
- bf_read (si->current_file->bf, si->sysno+1, 0, 0, buf);
+ int r = bf_read (si->current_file->bf, si->sysno+1, 0, 0, buf);
+ if (!r)
+ memset (buf, 0, SORT_IDX_ENTRYSIZE);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+