X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=979d919755654b37d8a762572f2d189d4d13888e;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=8993d1bf60ba39f00471f30b999a7a26fc1cf772;hpb=dc017c2fd1686d5a1bb5b04c45f11c69da60421a;p=idzebra-moved-to-github.git

diff --git a/index/sortidx.c b/index/sortidx.c
index 8993d1b..979d919 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,24 +1,39 @@
-/*
- * 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.18 2006-08-14 10:40:15 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;
+    SYSNO sysno_max;
 };
 
 struct sortFile {
@@ -31,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;
@@ -39,12 +54,12 @@ struct sortIdx {
 
 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;
 }
 
@@ -75,28 +90,35 @@ int sortIdx_type (SortIdx si, int type)
 	    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, SYSNO sysno)
 {
-    si->sysno = sysno;
+    si->sysno = rec_sysno_to_int(sysno);
 }
 
 void sortIdx_add (SortIdx si, const char *buf, int len)
@@ -118,5 +140,18 @@ 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;
+
+    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
+ */
+