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

diff --git a/index/sortidx.c b/index/sortidx.c
index 093e120..979d919 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,5 +1,5 @@
-/* $Id: sortidx.c,v 1.13 2005-01-15 19:38:27 adam Exp $
-   Copyright (C) 1995-2005
+/* $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.
@@ -15,19 +15,20 @@ 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.
+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 <yaz/xmalloc.h>
 #include <idzebra/bfile.h>
 #include <sortidx.h>
+#include "recindex.h"
 
 #define SORT_IDX_BLOCKSIZE 64
 
@@ -117,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)
@@ -139,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
+ */
+