From 3d6d9a44b38717e7e9a2c64b68db895998d4de82 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 9 Aug 2005 12:30:46 +0000
Subject: [PATCH] Allow record subsystem to return system numbers (document
 ID) with a fake offset. This is to test that Perl API and
 other components works properly with 64-bit integers.

---
 index/recindex.c   |  213 ++++++++++++++++++++++++++++++----------------------
 index/recindex.h   |   23 +++---
 index/sortidx.c    |    5 +-
 index/zinfo.c      |    6 +-
 test/api/testlib.c |   47 +++++++++++-
 test/api/testlib.h |    4 +-
 test/sort/sort1.c  |   40 +---------
 test/sort2/t1.c    |   35 ++-------
 8 files changed, 202 insertions(+), 171 deletions(-)

diff --git a/index/recindex.c b/index/recindex.c
index c3392dd..31d20ab 100644
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -1,4 +1,4 @@
-/* $Id: recindex.c,v 1.44 2005-05-11 12:36:45 adam Exp $
+/* $Id: recindex.c,v 1.45 2005-08-09 12:30:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -48,6 +48,31 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #if HAVE_BZLIB_H
 #include <bzlib.h>
 #endif
+
+/* Modify argument to if below: 1=normal, 0=sysno testing */
+#if 1
+/* If this is used sysno are not converted (no testing) */
+#define FAKE_OFFSET 0
+#define USUAL_RANGE 6000000000LL
+
+#else
+/* Use a fake > 2^32 offset so we can test for proper 64-bit handling */
+#define FAKE_OFFSET 6000000000LL
+#define USUAL_RANGE 2000000000LL
+#endif
+
+static SYSNO rec_sysno_to_ext(SYSNO sysno)
+{
+    assert(sysno >= 0 && sysno <= USUAL_RANGE);
+    return sysno + FAKE_OFFSET;
+}
+
+SYSNO rec_sysno_to_int(SYSNO sysno)
+{
+    assert(sysno >= FAKE_OFFSET && sysno <= FAKE_OFFSET + USUAL_RANGE);
+    return sysno - FAKE_OFFSET;
+}
+
 static void rec_write_head(Records p)
 {
     int r;
@@ -137,7 +162,7 @@ static void rec_release_blocks(Records p, SYSNO sysno)
 		     block_and_ref) != 1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "read in rec_del_single");
-            exit (1);
+            exit(1);
         }
 	if (first)
 	{
@@ -151,7 +176,7 @@ static void rec_release_blocks(Records p, SYSNO sysno)
 			      sizeof(block_and_ref), block_and_ref))
 		{
 		    yaz_log(YLOG_FATAL|YLOG_ERRNO, "write in rec_del_single");
-		    exit (1);
+		    exit(1);
 		}
 		return;
 	    }
@@ -176,12 +201,12 @@ static void rec_delete_single(Records p, Record rec)
 {
     struct record_index_entry entry;
 
-    rec_release_blocks(p, rec->sysno);
+    rec_release_blocks(p, rec_sysno_to_int(rec->sysno));
 
     entry.next = p->head.index_free;
     entry.size = 0;
-    p->head.index_free = rec->sysno;
-    write_indx(p, rec->sysno, &entry, sizeof(entry));
+    p->head.index_free = rec_sysno_to_int(rec->sysno);
+    write_indx(p, rec_sysno_to_int(rec->sysno), &entry, sizeof(entry));
 }
 
 static void rec_write_tmp_buf(Records p, int size, SYSNO *sysnos)
@@ -208,7 +233,7 @@ static void rec_write_tmp_buf(Records p, int size, SYSNO *sysnos)
                 yaz_log(YLOG_FATAL|YLOG_ERRNO, "read in %s at free block "
 			 ZINT_FORMAT,
 			 p->data_fname[dst_type], block_free);
-		exit (1);
+		exit(1);
             }
         }
         else
@@ -220,7 +245,7 @@ static void rec_write_tmp_buf(Records p, int size, SYSNO *sysnos)
             p->head.total_bytes += size;
 	    while (*sysnos > 0)
 	    {
-		write_indx (p, *sysnos, &entry, sizeof(entry));
+		write_indx(p, *sysnos, &entry, sizeof(entry));
 		sysnos++;
 	    }
         }
@@ -247,24 +272,24 @@ Records rec_open(BFiles bfs, int rw, int compression_method)
     int i, r;
     int version;
 
-    p = (Records) xmalloc (sizeof(*p));
+    p = (Records) xmalloc(sizeof(*p));
     p->compression_method = compression_method;
     p->rw = rw;
     p->tmp_size = 1024;
-    p->tmp_buf = (char *) xmalloc (p->tmp_size);
+    p->tmp_buf = (char *) xmalloc(p->tmp_size);
     p->index_fname = "reci";
-    p->index_BFile = bf_open (bfs, p->index_fname, RIDX_CHUNK, rw);
+    p->index_BFile = bf_open(bfs, p->index_fname, RIDX_CHUNK, rw);
     if (p->index_BFile == NULL)
     {
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "open %s", p->index_fname);
-        exit (1);
+        exit(1);
     }
     r = bf_read(p->index_BFile, 0, 0, 0, p->tmp_buf);
     switch (r)
     {
     case 0:
         memcpy(p->head.magic, REC_HEAD_MAGIC, sizeof(p->head.magic));
-	sprintf (p->head.version, "%3d", REC_VERSION);
+	sprintf(p->head.version, "%3d", REC_VERSION);
         p->head.index_free = 0;
         p->head.index_last = 1;
         p->head.no_records = 0;
@@ -287,43 +312,43 @@ Records rec_open(BFiles bfs, int rw, int compression_method)
         break;
     case 1:
         memcpy(&p->head, p->tmp_buf, sizeof(p->head));
-        if (memcmp (p->head.magic, REC_HEAD_MAGIC, sizeof(p->head.magic)))
+        if (memcmp(p->head.magic, REC_HEAD_MAGIC, sizeof(p->head.magic)))
         {
             yaz_log(YLOG_FATAL, "file %s has bad format", p->index_fname);
-            exit (1);
+            exit(1);
         }
-	version = atoi (p->head.version);
+	version = atoi(p->head.version);
 	if (version != REC_VERSION)
 	{
 	    yaz_log(YLOG_FATAL, "file %s is version %d, but version"
 		  " %d is required", p->index_fname, version, REC_VERSION);
-	    exit (1);
+	    exit(1);
 	}
         break;
     }
     for (i = 0; i<REC_BLOCK_TYPES; i++)
     {
         char str[80];
-        sprintf (str, "recd%c", i + 'A');
-        p->data_fname[i] = (char *) xmalloc (strlen(str)+1);
+        sprintf(str, "recd%c", i + 'A');
+        p->data_fname[i] = (char *) xmalloc(strlen(str)+1);
         strcpy(p->data_fname[i], str);
         p->data_BFile[i] = NULL;
     }
     for (i = 0; i<REC_BLOCK_TYPES; i++)
     {
-        if (!(p->data_BFile[i] = bf_open (bfs, p->data_fname[i],
-                                          (int) (p->head.block_size[i]),
-                                          rw)))
+        if (!(p->data_BFile[i] = bf_open(bfs, p->data_fname[i],
+					 (int) (p->head.block_size[i]),
+					 rw)))
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "bf_open %s", p->data_fname[i]);
-            exit (1);
+            exit(1);
         }
     }
     p->cache_max = 400;
     p->cache_cur = 0;
     p->record_cache = (struct record_cache_entry *)
-	xmalloc (sizeof(*p->record_cache)*p->cache_max);
-    zebra_mutex_init (&p->mutex);
+	xmalloc(sizeof(*p->record_cache)*p->cache_max);
+    zebra_mutex_init(&p->mutex);
     return p;
 }
 
@@ -399,32 +424,33 @@ static void rec_cache_flush_block1(Records p, Record rec, Record last_rec,
 	if (*out_offset + (int) rec->size[i] + 20 > *out_size)
 	{
 	    int new_size = *out_offset + rec->size[i] + 65536;
-	    char *np = (char *) xmalloc (new_size);
+	    char *np = (char *) xmalloc(new_size);
 	    if (*out_offset)
 		memcpy(np, *out_buf, *out_offset);
-	    xfree (*out_buf);
+	    xfree(*out_buf);
 	    *out_size = new_size;
 	    *out_buf = np;
 	}
 	if (i == 0)
 	{
-	    rec_encode_zint (rec->sysno, *out_buf + *out_offset, &len);
+	    rec_encode_zint(rec_sysno_to_int(rec->sysno), 
+			    *out_buf + *out_offset, &len);
 	    (*out_offset) += len;
 	}
 	if (rec->size[i] == 0)
 	{
-	    rec_encode_unsigned (1, *out_buf + *out_offset, &len);
+	    rec_encode_unsigned(1, *out_buf + *out_offset, &len);
 	    (*out_offset) += len;
 	}
 	else if (last_rec && rec->size[i] == last_rec->size[i] &&
-		 !memcmp (rec->info[i], last_rec->info[i], rec->size[i]))
+		 !memcmp(rec->info[i], last_rec->info[i], rec->size[i]))
 	{
-	    rec_encode_unsigned (0, *out_buf + *out_offset, &len);
+	    rec_encode_unsigned(0, *out_buf + *out_offset, &len);
 	    (*out_offset) += len;
 	}
 	else
 	{
-	    rec_encode_unsigned (rec->size[i]+1, *out_buf + *out_offset, &len);
+	    rec_encode_unsigned(rec->size[i]+1, *out_buf + *out_offset, &len);
 	    (*out_offset) += len;
 	    memcpy(*out_buf + *out_offset, rec->info[i], rec->size[i]);
 	    (*out_offset) += rec->size[i];
@@ -440,8 +466,8 @@ static void rec_write_multiple(Records p, int saveCount)
     Record last_rec = 0;
     int out_size = 1000;
     int out_offset = 0;
-    char *out_buf = (char *) xmalloc (out_size);
-    SYSNO *sysnos = (SYSNO *) xmalloc (sizeof(*sysnos) * (p->cache_cur + 1));
+    char *out_buf = (char *) xmalloc(out_size);
+    SYSNO *sysnos = (SYSNO *) xmalloc(sizeof(*sysnos) * (p->cache_cur + 1));
     SYSNO *sysnop = sysnos;
 
     for (i = 0; i<p->cache_cur - saveCount; i++)
@@ -450,24 +476,24 @@ static void rec_write_multiple(Records p, int saveCount)
         switch (e->flag)
         {
         case recordFlagNew:
-            rec_cache_flush_block1 (p, e->rec, last_rec, &out_buf,
+            rec_cache_flush_block1(p, e->rec, last_rec, &out_buf,
 				    &out_size, &out_offset);
-	    *sysnop++ = e->rec->sysno;
+	    *sysnop++ = rec_sysno_to_int(e->rec->sysno);
 	    ref_count++;
 	    e->flag = recordFlagNop;
 	    last_rec = e->rec;
             break;
         case recordFlagWrite:
-	    rec_release_blocks (p, e->rec->sysno);
-            rec_cache_flush_block1 (p, e->rec, last_rec, &out_buf,
+	    rec_release_blocks(p, rec_sysno_to_int(e->rec->sysno));
+            rec_cache_flush_block1(p, e->rec, last_rec, &out_buf,
 				    &out_size, &out_offset);
-	    *sysnop++ = e->rec->sysno;
+	    *sysnop++ = rec_sysno_to_int(e->rec->sysno);
 	    ref_count++;
 	    e->flag = recordFlagNop;
 	    last_rec = e->rec;
             break;
         case recordFlagDelete:
-            rec_delete_single (p, e->rec);
+            rec_delete_single(p, e->rec);
 	    e->flag = recordFlagNop;
             break;
 	default:
@@ -485,13 +511,13 @@ static void rec_write_multiple(Records p, int saveCount)
 	case REC_COMPRESS_BZIP2:
 #if HAVE_BZLIB_H	
 	    csize = out_offset + (out_offset >> 6) + 620;
-	    rec_tmp_expand (p, csize);
+	    rec_tmp_expand(p, csize);
 #ifdef BZ_CONFIG_ERROR
 	    i = BZ2_bzBuffToBuffCompress 
 #else
 	    i = bzBuffToBuffCompress 
 #endif
-			 	     (p->tmp_buf+sizeof(zint)+sizeof(short)+
+			 	    (p->tmp_buf+sizeof(zint)+sizeof(short)+
 				      sizeof(char),
 				      &csize, out_buf, out_offset, 1, 0, 30);
 	    if (i != BZ_OK)
@@ -510,7 +536,7 @@ static void rec_write_multiple(Records p, int saveCount)
 	{
 	    /* either no compression or compression not supported ... */
 	    csize = out_offset;
-	    rec_tmp_expand (p, csize);
+	    rec_tmp_expand(p, csize);
 	    memcpy(p->tmp_buf + sizeof(zint) + sizeof(short) + sizeof(char),
 		    out_buf, out_offset);
 	    csize = out_offset;
@@ -521,10 +547,10 @@ static void rec_write_multiple(Records p, int saveCount)
 		&compression_method, sizeof(compression_method));
 		
 	/* -------- compression */
-	rec_write_tmp_buf (p, csize + sizeof(short) + sizeof(char), sysnos);
+	rec_write_tmp_buf(p, csize + sizeof(short) + sizeof(char), sysnos);
     }
-    xfree (out_buf);
-    xfree (sysnos);
+    xfree(out_buf);
+    xfree(sysnos);
 }
 
 static void rec_cache_flush(Records p, int saveCount)
@@ -534,7 +560,7 @@ static void rec_cache_flush(Records p, int saveCount)
     if (saveCount >= p->cache_cur)
         saveCount = 0;
 
-    rec_write_multiple (p, saveCount);
+    rec_write_multiple(p, saveCount);
 
     for (i = 0; i<p->cache_cur - saveCount; i++)
     {
@@ -570,7 +596,7 @@ static void rec_cache_insert(Records p, Record rec, enum recordCacheFlag flag)
     struct record_cache_entry *e;
 
     if (p->cache_cur == p->cache_max)
-        rec_cache_flush (p, 1);
+        rec_cache_flush(p, 1);
     else if (p->cache_cur > 0)
     {
         int i, j;
@@ -582,13 +608,13 @@ static void rec_cache_insert(Records p, Record rec, enum recordCacheFlag flag)
                 used += r->size[j];
         }
         if (used > 90000)
-            rec_cache_flush (p, 1);
+            rec_cache_flush(p, 1);
     }
     assert(p->cache_cur < p->cache_max);
 
     e = p->record_cache + (p->cache_cur)++;
     e->flag = flag;
-    e->rec = rec_cp (rec);
+    e->rec = rec_cp(rec);
 }
 
 void rec_close(Records *pp)
@@ -599,23 +625,23 @@ void rec_close(Records *pp)
     assert(p);
 
     zebra_mutex_destroy(&p->mutex);
-    rec_cache_flush (p, 0);
-    xfree (p->record_cache);
+    rec_cache_flush(p, 0);
+    xfree(p->record_cache);
 
     if (p->rw)
         rec_write_head(p);
 
     if (p->index_BFile)
-        bf_close (p->index_BFile);
+        bf_close(p->index_BFile);
 
     for (i = 0; i<REC_BLOCK_TYPES; i++)
     {
         if (p->data_BFile[i])
-            bf_close (p->data_BFile[i]);
-        xfree (p->data_fname[i]);
+            bf_close(p->data_BFile[i]);
+        xfree(p->data_fname[i]);
     }
-    xfree (p->tmp_buf);
-    xfree (p);
+    xfree(p->tmp_buf);
+    xfree(p);
     *pp = NULL;
 }
 
@@ -637,10 +663,10 @@ static Record rec_get_int(Records p, SYSNO sysno)
     assert(sysno > 0);
     assert(p);
 
-    if ((recp = rec_cache_lookup (p, sysno, recordFlagNop)))
-        return rec_cp (*recp);
+    if ((recp = rec_cache_lookup(p, sysno, recordFlagNop)))
+        return rec_cp(*recp);
 
-    if (read_indx (p, sysno, &entry, sizeof(entry), 1) < 1)
+    if (read_indx(p, rec_sysno_to_int(sysno), &entry, sizeof(entry), 1) < 1)
         return NULL;       /* record is not there! */
 
     if (!entry.size)
@@ -652,7 +678,7 @@ static Record rec_get_int(Records p, SYSNO sysno)
 
     assert(freeblock > 0);
     
-    rec_tmp_expand (p, entry.size);
+    rec_tmp_expand(p, entry.size);
 
     cptr = p->tmp_buf;
     r = bf_read(p->data_BFile[dst_type], freeblock, 0, 0, cptr);
@@ -674,7 +700,7 @@ static Record rec_get_int(Records p, SYSNO sysno)
         memcpy(cptr, &tmp, sizeof(tmp));
     }
 
-    rec = (Record) xmalloc (sizeof(*rec));
+    rec = (Record) xmalloc(sizeof(*rec));
     rec->sysno = sysno;
     memcpy(&compression_method, p->tmp_buf + sizeof(zint) + sizeof(short),
 	    sizeof(compression_method));
@@ -687,25 +713,25 @@ static Record rec_get_int(Records p, SYSNO sysno)
 	bz_size = entry.size * 20 + 100;
 	while (1)
 	{
-	    bz_buf = (char *) xmalloc (bz_size);
+	    bz_buf = (char *) xmalloc(bz_size);
 #ifdef BZ_CONFIG_ERROR
 	    i = BZ2_bzBuffToBuffDecompress
 #else
 	    i = bzBuffToBuffDecompress
 #endif
-                 (bz_buf, &bz_size, in_buf, in_size, 0, 0);
+                (bz_buf, &bz_size, in_buf, in_size, 0, 0);
 	    yaz_log(YLOG_LOG, "decompress %5d %5d", in_size, bz_size);
 	    if (i == BZ_OK)
 		break;
 	    yaz_log(YLOG_LOG, "failed");
-	    xfree (bz_buf);
+	    xfree(bz_buf);
             bz_size *= 2;
 	}
 	in_buf = bz_buf;
 	in_size = bz_size;
 #else
 	yaz_log(YLOG_FATAL, "cannot decompress record(s) in BZIP2 format");
-	exit (1);
+	exit(1);
 #endif
 	break;
     case REC_COMPRESS_NONE:
@@ -719,13 +745,13 @@ static Record rec_get_int(Records p, SYSNO sysno)
     {
 	zint this_sysno;
 	int len;
-	rec_decode_zint (&this_sysno, nptr, &len);
+	rec_decode_zint(&this_sysno, nptr, &len);
 	nptr += len;
 
 	for (i = 0; i < REC_NO_INFO; i++)
 	{
 	    int this_size;
-	    rec_decode_unsigned (&this_size, nptr, &len);
+	    rec_decode_unsigned(&this_size, nptr, &len);
 	    nptr += len;
 
 	    if (this_size == 0)
@@ -740,14 +766,14 @@ static Record rec_get_int(Records p, SYSNO sysno)
 	    else
 		rec->info[i] = NULL;
 	}
-	if (this_sysno == sysno)
+	if (this_sysno == rec_sysno_to_int(sysno))
 	    break;
     }
     for (i = 0; i<REC_NO_INFO; i++)
     {
 	if (rec->info[i] && rec->size[i])
 	{
-	    char *np = xmalloc (rec->size[i]+1);
+	    char *np = xmalloc(rec->size[i]+1);
 	    memcpy(np, rec->info[i], rec->size[i]);
             np[rec->size[i]] = '\0';
 	    rec->info[i] = np;
@@ -758,7 +784,7 @@ static Record rec_get_int(Records p, SYSNO sysno)
 	    assert(rec->size[i] == 0);
 	}
     }
-    xfree (bz_buf);
+    xfree(bz_buf);
     rec_cache_insert(p, rec, recordFlagNop);
     return rec;
 }
@@ -766,13 +792,18 @@ static Record rec_get_int(Records p, SYSNO sysno)
 Record rec_get(Records p, SYSNO sysno)
 {
     Record rec;
-    zebra_mutex_lock (&p->mutex);
+    zebra_mutex_lock(&p->mutex);
 
-    rec = rec_get_int (p, sysno);
-    zebra_mutex_unlock (&p->mutex);
+    rec = rec_get_int(p, sysno);
+    zebra_mutex_unlock(&p->mutex);
     return rec;
 }
 
+Record rec_get_root(Records p)
+{
+    return rec_get(p, rec_sysno_to_ext(1));
+}
+
 static Record rec_new_int(Records p)
 {
     int i;
@@ -780,19 +811,19 @@ static Record rec_new_int(Records p)
     Record rec;
 
     assert(p);
-    rec = (Record) xmalloc (sizeof(*rec));
+    rec = (Record) xmalloc(sizeof(*rec));
     if (1 || p->head.index_free == 0)
         sysno = (p->head.index_last)++;
     else
     {
         struct record_index_entry entry;
 
-        read_indx (p, p->head.index_free, &entry, sizeof(entry), 0);
+        read_indx(p, p->head.index_free, &entry, sizeof(entry), 0);
         sysno = p->head.index_free;
         p->head.index_free = entry.next;
     }
     (p->head.no_records)++;
-    rec->sysno = sysno;
+    rec->sysno = rec_sysno_to_ext(sysno);
     for (i = 0; i < REC_NO_INFO; i++)
     {
         rec->info[i] = NULL;
@@ -805,10 +836,10 @@ static Record rec_new_int(Records p)
 Record rec_new(Records p)
 {
     Record rec;
-    zebra_mutex_lock (&p->mutex);
+    zebra_mutex_lock(&p->mutex);
 
-    rec = rec_new_int (p);
-    zebra_mutex_unlock (&p->mutex);
+    rec = rec_new_int(p);
+    zebra_mutex_unlock(&p->mutex);
     return rec;
 }
 
@@ -816,9 +847,9 @@ void rec_del(Records p, Record *recpp)
 {
     Record *recp;
 
-    zebra_mutex_lock (&p->mutex);
+    zebra_mutex_lock(&p->mutex);
     (p->head.no_records)--;
-    if ((recp = rec_cache_lookup (p, (*recpp)->sysno, recordFlagDelete)))
+    if ((recp = rec_cache_lookup(p, (*recpp)->sysno, recordFlagDelete)))
     {
         rec_rm(recp);
         *recp = *recpp;
@@ -828,7 +859,7 @@ void rec_del(Records p, Record *recpp)
         rec_cache_insert(p, *recpp, recordFlagDelete);
         rec_rm(recpp);
     }
-    zebra_mutex_unlock (&p->mutex);
+    zebra_mutex_unlock(&p->mutex);
     *recpp = NULL;
 }
 
@@ -836,8 +867,8 @@ void rec_put(Records p, Record *recpp)
 {
     Record *recp;
 
-    zebra_mutex_lock (&p->mutex);
-    if ((recp = rec_cache_lookup (p, (*recpp)->sysno, recordFlagWrite)))
+    zebra_mutex_lock(&p->mutex);
+    if ((recp = rec_cache_lookup(p, (*recpp)->sysno, recordFlagWrite)))
     {
         rec_rm(recp);
         *recp = *recpp;
@@ -847,7 +878,7 @@ void rec_put(Records p, Record *recpp)
         rec_cache_insert(p, *recpp, recordFlagWrite);
         rec_rm(recpp);
     }
-    zebra_mutex_unlock (&p->mutex);
+    zebra_mutex_unlock(&p->mutex);
     *recpp = NULL;
 }
 
@@ -858,8 +889,8 @@ void rec_rm(Record *recpp)
     if (!*recpp)
         return ;
     for (i = 0; i < REC_NO_INFO; i++)
-        xfree ((*recpp)->info[i]);
-    xfree (*recpp);
+        xfree((*recpp)->info[i]);
+    xfree(*recpp);
     *recpp = NULL;
 }
 
@@ -868,7 +899,7 @@ Record rec_cp(Record rec)
     Record n;
     int i;
 
-    n = (Record) xmalloc (sizeof(*n));
+    n = (Record) xmalloc(sizeof(*n));
     n->sysno = rec->sysno;
     for (i = 0; i < REC_NO_INFO; i++)
         if (!rec->info[i])
@@ -879,7 +910,7 @@ Record rec_cp(Record rec)
         else
         {
             n->size[i] = rec->size[i];
-            n->info[i] = (char *) xmalloc (rec->size[i]);
+            n->info[i] = (char *) xmalloc(rec->size[i]);
             memcpy(n->info[i], rec->info[i], rec->size[i]);
         }
     return n;
@@ -896,7 +927,7 @@ char *rec_strdup(const char *s, size_t *len)
         return NULL;
     }
     *len = strlen(s)+1;
-    p = (char *) xmalloc (*len);
+    p = (char *) xmalloc(*len);
     strcpy(p, s);
     return p;
 }
diff --git a/index/recindex.h b/index/recindex.h
index 403795d..371fc6d 100644
--- a/index/recindex.h
+++ b/index/recindex.h
@@ -1,4 +1,4 @@
-/* $Id: recindex.h,v 1.24 2005-03-30 09:25:23 adam Exp $
+/* $Id: recindex.h,v 1.25 2005-08-09 12:30:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -43,16 +43,19 @@ typedef struct record_info {
 
 typedef struct records_info *Records;
 
-Record rec_cp (Record rec);
-void rec_del (Records p, Record *recpp);
-void rec_rm (Record *recpp);
-void rec_put (Records p, Record *recpp);
-Record rec_new (Records p);
-Record rec_get (Records p, SYSNO sysno);
+Record rec_cp(Record rec);
+void rec_del(Records p, Record *recpp);
+void rec_rm(Record *recpp);
+void rec_put(Records p, Record *recpp);
+Record rec_new(Records p);
+Record rec_get(Records p, SYSNO sysno);
+Record rec_get_root(Records p);
 void rec_close (Records *p);
-Records rec_open (BFiles bfs, int rw, int compression_method);
-char *rec_strdup (const char *s, size_t *len);
-void rec_prstat (Records p);
+Records rec_open(BFiles bfs, int rw, int compression_method);
+char *rec_strdup(const char *s, size_t *len);
+void rec_prstat(Records p);
+
+SYSNO rec_sysno_to_int(SYSNO sysno);
 
 #define REC_COMPRESS_NONE   0
 #define REC_COMPRESS_BZIP2  1
diff --git a/index/sortidx.c b/index/sortidx.c
index 093e120..0c4ebfc 100644
--- a/index/sortidx.c
+++ b/index/sortidx.c
@@ -1,4 +1,4 @@
-/* $Id: sortidx.c,v 1.13 2005-01-15 19:38:27 adam Exp $
+/* $Id: sortidx.c,v 1.14 2005-08-09 12:30:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -28,6 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #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)
diff --git a/index/zinfo.c b/index/zinfo.c
index fc355db..3816e51 100644
--- a/index/zinfo.c
+++ b/index/zinfo.c
@@ -1,4 +1,4 @@
-/* $Id: zinfo.c,v 1.47 2005-08-05 10:40:13 adam Exp $
+/* $Id: zinfo.c,v 1.48 2005-08-09 12:30:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -373,7 +373,7 @@ ZebraExplainInfo zebraExplain_open (
 	         0, 0, 0,  0, 0, 0);
     }
     zdip = &zei->databaseInfo;
-    trec = rec_get (records, 1);      /* get "root" record */
+    trec = rec_get_root(records);      /* get "root" record */
 
     zei->ordinalSU = 1;
     zei->runNumber = 0;
@@ -1309,7 +1309,7 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush)
 	return;
     zei->dirty = 0;
 
-    trec = rec_get (zei->records, 1);
+    trec = rec_get_root(zei->records);
     xfree (trec->info[recInfo_storeData]);
 
     node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
diff --git a/test/api/testlib.c b/test/api/testlib.c
index 8301cb6..e5a7745 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.24 2005-08-09 09:35:26 adam Exp $
+/* $Id: testlib.c,v 1.25 2005-08-09 12:30:47 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -378,6 +378,51 @@ void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
     free(positions);
 }
 
+void do_sort(ZebraHandle zh, const char *query, zint hits, zint *exp)
+{
+    ZebraMetaRecord *recs;
+    zint i;
+    int errs = 0;
+    zint min_val_recs = 0;
+    zint min_val_exp = 0;
+
+    assert(query);
+    do_query(__LINE__, zh, query, hits);
+
+    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
+    if (!recs)
+    {
+	fprintf(stderr, "recs==0\n");
+	exit(1);
+    }
+    /* find min for each sequence to get proper base offset */
+    for (i = 0; i<hits; i++)
+    {
+	if (min_val_recs == 0 || recs[i].sysno < min_val_recs)
+	    min_val_recs = recs[i].sysno;
+	if (min_val_exp == 0 || exp[i] < min_val_exp)
+	    min_val_exp = exp[i];
+    }
+	    
+    /* compare sequences using base offset */
+    for (i = 0; i<hits; i++)
+	if ((recs[i].sysno-min_val_recs) != (exp[i]-min_val_exp))
+	    errs++;
+    if (errs)
+    {
+	printf("Sequence not in right order for query\n%s\ngot exp\n",
+	       query);
+	for (i = 0; i<hits; i++)
+	    printf(" " ZINT_FORMAT "   " ZINT_FORMAT "\n",
+		   recs[i].sysno, exp[i]);
+    }
+    zebra_meta_records_destroy (zh, recs, 4);
+
+    if (errs)
+	exit(1);
+}
+
+
 struct finfo {
     const char *name;
     int occurred;
diff --git a/test/api/testlib.h b/test/api/testlib.h
index cbe06cc..ce7c1d0 100644
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,4 +1,4 @@
-/* $Id: testlib.h,v 1.14 2005-05-04 10:50:09 adam Exp $
+/* $Id: testlib.h,v 1.15 2005-08-09 12:30:47 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -94,6 +94,8 @@ void do_scan(int lineno, ZebraHandle zh, const char *query,
 	     const char **exp_entries  /* expected entries (or NULL) */
     );
 
+void do_sort(ZebraHandle zh, const char *query, zint hits, zint *exp);
+
 /** 
  * ranking_query makes a query, checks number of hits, and for 
  * the first hit, that it contains the given string, and that it 
diff --git a/test/sort/sort1.c b/test/sort/sort1.c
index 3ce5353..b86d22b 100644
--- a/test/sort/sort1.c
+++ b/test/sort/sort1.c
@@ -1,4 +1,4 @@
-/* $Id: sort1.c,v 1.4 2005-05-04 10:50:09 adam Exp $
+/* $Id: sort1.c,v 1.5 2005-08-09 12:30:47 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -23,38 +23,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include "../api/testlib.h"
 
-static void sort(ZebraHandle zh, const char *query, zint hits, zint *exp)
-{
-    ZebraMetaRecord *recs;
-    zint i;
-    int errs = 0;
-
-    assert(query);
-    do_query(__LINE__, zh, query, hits);
-
-    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
-    if (!recs)
-    {
-	fprintf(stderr, "recs==0\n");
-	exit(1);
-    }
-    for (i = 0; i<hits; i++)
-	if (recs[i].sysno != exp[i])
-	    errs++;
-    if (errs)
-    {
-	printf("Sequence not in right order for query\n%s\ngot exp\n",
-	       query);
-	for (i = 0; i<hits; i++)
-	    printf(" " ZINT_FORMAT "   " ZINT_FORMAT "\n",
-		   recs[i].sysno, exp[i]);
-    }
-    zebra_meta_records_destroy (zh, recs, 4);
-
-    if (errs)
-	exit(1);
-}
-
 int main(int argc, char **argv)
 {
     ZebraService zs = start_up(0, argc, argv);
@@ -80,19 +48,19 @@ int main(int argc, char **argv)
     ids[1] = 2;
     ids[2] = 4;
     ids[3] = 5;
-    sort(zh, "@or computer @attr 7=1 @attr 1=30 0", 4, ids);
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=30 0", 4, ids);
 
     ids[0] = 5;
     ids[1] = 4;
     ids[2] = 2;
     ids[3] = 3;
-    sort(zh, "@or computer @attr 7=1 @attr 1=1021 0", 4, ids);
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=1021 0", 4, ids);
 
     ids[0] = 2;
     ids[1] = 5;
     ids[2] = 4;
     ids[3] = 3;
-    sort(zh, "@or computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids);
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids);
 
     return close_down(zh, zs, 0);
 }
diff --git a/test/sort2/t1.c b/test/sort2/t1.c
index d89335d..4812c02 100644
--- a/test/sort2/t1.c
+++ b/test/sort2/t1.c
@@ -1,4 +1,4 @@
-/* $Id: t1.c,v 1.2 2005-01-15 19:38:39 adam Exp $
+/* $Id: t1.c,v 1.3 2005-08-09 12:30:48 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -26,9 +26,9 @@ int main(int argc, char **argv)
 {
     ZebraService zs = start_up(0, argc, argv);
     ZebraHandle  zh = zebra_open(zs);
-    ZebraMetaRecord *recs;
     char path[256];
-    int i, errs = 0;
+    int i;
+    zint ids[5];
 
     zebra_select_database(zh, "Default");
 
@@ -43,30 +43,11 @@ int main(int argc, char **argv)
     zebra_end_trans(zh);
     zebra_commit(zh);
 
-    do_query(__LINE__, zh, "@or computer @attr 7=1 @attr 1=4 0", 4);
-
-    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
-    if (!recs)
-    {
-	fprintf(stderr, "recs==0\n");
-	exit(1);
-    }
-    if (recs[0].sysno != 2)
-	errs++;
-    if (recs[1].sysno != 5)
-	errs++;
-    if (recs[2].sysno != 3)
-	errs++;
-    if (recs[3].sysno != 4)
-	errs++;
-
-    zebra_meta_records_destroy (zh, recs, 4);
-
-    if (errs)
-    {
-	fprintf(stderr, "%d sysnos did not match\n", errs);
-	exit(1);
-    }
+    ids[0] = 2;
+    ids[1] = 5;
+    ids[2] = 3;
+    ids[3] = 4;
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=4 0", 4, ids);
 
     return close_down(zh, zs, 0);
 }
-- 
1.7.10.4