X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=6cddaf41532bc9dd6c19b2104d9c17c53e28b0ea;hb=f7a3769dede0071696bdcc13ae2ee1efe6d52d96;hp=093e1204cd5b4fe6b8c05077bb29bec691fa7afa;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git diff --git a/index/sortidx.c b/index/sortidx.c index 093e120..6cddaf4 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.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,13 +21,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA */ - +#include #include #include #include #include #include +#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 + */ +