X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=6cddaf41532bc9dd6c19b2104d9c17c53e28b0ea;hb=963f6ae94a0fddbf19740d932fff79b43b2d8f0f;hp=2f61fedb8ef16a9e30d80af0a393eb44c73cd974;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git

diff --git a/index/sortidx.c b/index/sortidx.c
index 2f61fed..6cddaf4 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,6 +1,6 @@
-/* $Id: sortidx.c,v 1.10 2004-11-19 10:27:03 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: sortidx.c,v 1.17 2006-05-18 12:03:05 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -21,12 +21,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 */
 
 
- 
+#include <assert.h> 
 #include <string.h>
 
-#include <yaz/ylog.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
 
@@ -116,7 +118,7 @@ int sortIdx_type (SortIdx si, int type)
 
 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)
@@ -138,7 +140,18 @@ void sortIdx_add (SortIdx si, const char *buf, int len)
 
 void sortIdx_read (SortIdx si, char *buf)
 {
-    int r = 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
+ */
+