X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fsortidx.c;h=093e1204cd5b4fe6b8c05077bb29bec691fa7afa;hp=fe55828c1029c1cbe2b3cd2a45670f1509d158f3;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=587c1d5cac956ec0cf482fc14ecea40240e85fd8

diff --git a/index/sortidx.c b/index/sortidx.c
index fe55828..093e120 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,6 +1,6 @@
-/* $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
+/* $Id: sortidx.c,v 1.13 2005-01-15 19:38:27 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -25,13 +25,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 
 #include <yaz/log.h>
-#include <bfile.h>
+#include <yaz/xmalloc.h>
+#include <idzebra/bfile.h>
 #include <sortidx.h>
 
 #define SORT_IDX_BLOCKSIZE 64
 
 struct sortFileHead {
-    int sysno_max;
+    SYSNO sysno_max;
 };
 
 struct sortFile {
@@ -44,7 +45,7 @@ struct sortFile {
 struct sortIdx {
     BFiles bfs;
     int write_flag;
-    int sysno;
+    SYSNO sysno;
     char *entry_buf;
     struct sortFile *current_file;
     struct sortFile *files;
@@ -92,7 +93,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)
     {
@@ -114,7 +115,7 @@ int sortIdx_type (SortIdx si, int type)
     return 0;
 }
 
-void sortIdx_sysno (SortIdx si, int sysno)
+void sortIdx_sysno (SortIdx si, SYSNO sysno)
 {
     si->sysno = sysno;
 }