X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=d9c3fb8e9a5b839e4b42220b5f06c3b4ef1f2209;hb=6dfee19bc1cec29ff5ec5e9cd8021d1354a6126e;hp=5c9d5a3b81183b2f53842ce27aa7c73bc9bad9d3;hpb=e150e51a7e20a902e9fd2f11f00811f94f67d529;p=idzebra-moved-to-github.git

diff --git a/index/sortidx.c b/index/sortidx.c
index 5c9d5a3..d9c3fb8 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,30 +1,39 @@
-/*
- * Copyright (C) 1998, Index Data ApS
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: sortidx.c,v $
- * Revision 1.4  1999-11-30 13:48:03  adam
- * Improved installation. Updated for inclusion of YAZ header files.
- *
- * Revision 1.3  1999/05/26 07:49:13  adam
- * C++ compilation.
- *
- * Revision 1.2  1998/06/25 09:55:50  adam
- * Minor changes - fixex headers.
- *
- */
+/* $Id: sortidx.c,v 1.15 2005-08-18 19:20:38 adam Exp $
+   Copyright (C) 1995-2005
+   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>
 
 #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 {
@@ -37,7 +46,7 @@ struct sortFile {
 struct sortIdx {
     BFiles bfs;
     int write_flag;
-    int sysno;
+    SYSNO sysno;
     char *entry_buf;
     struct sortFile *current_file;
     struct sortFile *files;
@@ -84,25 +93,32 @@ int sortIdx_type (SortIdx si, int type)
     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, SYSNO sysno)
 {
-    si->sysno = sysno;
+    si->sysno = rec_sysno_to_int(sysno);
 }
 
 void sortIdx_add (SortIdx si, const char *buf, int len)
@@ -124,5 +140,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);
 }