X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=fe55828c1029c1cbe2b3cd2a45670f1509d158f3;hb=eb8857cfa2ceaa2635f14888b95d6f71b8def045;hp=b4e5d8a110b09f4e627fc465183cd2bbe2e54a12;hpb=0c293b944e22e54f19f7b5febd105f94c5971a81;p=idzebra-moved-to-github.git

diff --git a/index/sortidx.c b/index/sortidx.c
index b4e5d8a..fe55828 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.5 2002-01-07 19:52:22 adam Exp $
- */
+/* $Id: sortidx.c,v 1.8 2002-12-10 12:54:24 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   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>
 
@@ -88,8 +104,8 @@ int sortIdx_type (SortIdx si, int type)
 	sf->head.sysno_max = 0;
 	if (!si->write_flag)
         {
-            xfree (sf);
             bf_close (sf->bf);
+            xfree (sf);
 	    return -1;
         }
     }
@@ -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);
 }