-/*
- * Copyright (C) 1998, Index Data ApS
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: sortidx.c,v $
- * Revision 1.2 1998-06-25 09:55:50 adam
- * Minor changes - fixex headers.
- *
- */
-
+/* $Id: sortidx.c,v 1.19 2006-11-21 22:17:49 adam Exp $
+ Copyright (C) 1995-2006
+ 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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+
+
+#include <assert.h>
#include <string.h>
-#include <log.h>
-#include <bfile.h>
+#include <yaz/log.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;
+ zint sysno_max;
};
struct sortFile {
struct sortIdx {
BFiles bfs;
int write_flag;
- int sysno;
+ zint sysno;
char *entry_buf;
struct sortFile *current_file;
struct sortFile *files;
SortIdx sortIdx_open (BFiles bfs, int write_flag)
{
- SortIdx si = xmalloc (sizeof(*si));
+ SortIdx si = (SortIdx) xmalloc (sizeof(*si));
si->bfs = bfs;
si->write_flag = write_flag;
si->current_file = NULL;
si->files = NULL;
- si->entry_buf = xmalloc (SORT_IDX_ENTRYSIZE);
+ si->entry_buf = (char *) xmalloc (SORT_IDX_ENTRYSIZE);
return si;
}
si->current_file = sf;
return 0;
}
- sf = xmalloc (sizeof(*sf));
+ sf = (struct sortFile *) xmalloc (sizeof(*sf));
sf->type = type;
sf->bf = NULL;
- sf->next = si->files;
- si->current_file = si->files = sf;
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)
+ {
+ xfree (sf);
return -1;
+ }
if (!bf_read (sf->bf, 0, 0, sizeof(sf->head), &sf->head))
{
sf->head.sysno_max = 0;
if (!si->write_flag)
+ {
+ bf_close (sf->bf);
+ xfree (sf);
return -1;
+ }
}
+ sf->next = si->files;
+ si->current_file = si->files = sf;
return 0;
}
-void sortIdx_sysno (SortIdx si, int sysno)
+void sortIdx_sysno(SortIdx si, zint sysno)
{
- si->sysno = sysno;
+ si->sysno = rec_sysno_to_int(sysno);
}
-void sortIdx_add (SortIdx si, const char *buf, int len)
+void sortIdx_add(SortIdx si, const char *buf, int len)
{
if (!si->current_file || !si->current_file->bf)
return;
void sortIdx_read (SortIdx si, char *buf)
{
- bf_read (si->current_file->bf, si->sysno+1, 0, 0, buf);
+ int r;
+
+ assert(si->current_file);
+ 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
+ */
+