X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=e5f2435e23f8d08e134bd8ac96f25c5ce04945b8;hb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;hp=4d17ad7de85dcce72e7644260a4310f84f22305d;hpb=ac66787b71dd244e895a262a82b2a4944f8fea6b;p=idzebra-moved-to-github.git

diff --git a/index/sortidx.c b/index/sortidx.c
index 4d17ad7..e5f2435 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,10 +1,26 @@
-/*
- * Copyright (C) 1998-2002, Index Data ApS
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: sortidx.c,v 1.6 2002-02-18 11:46:58 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>
 
@@ -15,7 +31,7 @@
 #define SORT_IDX_BLOCKSIZE 64
 
 struct sortFileHead {
-    int sysno_max;
+    SYSNO sysno_max;
 };
 
 struct sortFile {
@@ -28,7 +44,7 @@ struct sortFile {
 struct sortIdx {
     BFiles bfs;
     int write_flag;
-    int sysno;
+    SYSNO sysno;
     char *entry_buf;
     struct sortFile *current_file;
     struct sortFile *files;
@@ -98,7 +114,7 @@ int sortIdx_type (SortIdx si, int type)
     return 0;
 }
 
-void sortIdx_sysno (SortIdx si, int sysno)
+void sortIdx_sysno (SortIdx si, SYSNO sysno)
 {
     si->sysno = sysno;
 }
@@ -122,5 +138,7 @@ 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);
 }