-/*
- * Copyright (C) 1998-2002, Index Data ApS
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: sortidx.c,v 1.5 2002-01-07 19:52:22 adam Exp $
- */
+/* $Id: sortidx.c,v 1.9 2004-08-04 08:35:23 adam 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 <string.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->head.sysno_max = 0;
if (!si->write_flag)
{
- xfree (sf);
bf_close (sf->bf);
+ xfree (sf);
return -1;
}
}
return 0;
}
-void sortIdx_sysno (SortIdx si, int sysno)
+void sortIdx_sysno (SortIdx si, SYSNO sysno)
{
si->sysno = sysno;
}
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);
}