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

diff --git a/index/sortidx.c b/index/sortidx.c
index 4d17ad7..08b16e6 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,21 +1,39 @@
-/*
- * 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.19 2006-11-21 22:17:49 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 <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;
+    zint sysno_max;
 };
 
 struct sortFile {
@@ -28,7 +46,7 @@ struct sortFile {
 struct sortIdx {
     BFiles bfs;
     int write_flag;
-    int sysno;
+    zint sysno;
     char *entry_buf;
     struct sortFile *current_file;
     struct sortFile *files;
@@ -76,7 +94,7 @@ int sortIdx_type (SortIdx si, int type)
     sf->type = type;
     sf->bf = NULL;
     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)
     {
@@ -98,12 +116,12 @@ int sortIdx_type (SortIdx si, int type)
     return 0;
 }
 
-void sortIdx_sysno (SortIdx si, int sysno)
+void sortIdx_sysno(SortIdx si, zint sysno)
 {
-    si->sysno = sysno;
+    si->sysno = rec_sysno_to_int(sysno);
 }
 
-void sortIdx_add (SortIdx si, const char *buf, int len)
+void sortIdx_add(SortIdx si, const char *buf, int len)
 {
     if (!si->current_file || !si->current_file->bf)
 	return;
@@ -122,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
+ */
+