Limiting hits to INT_MAX, because yaz can't handle 64-bit hitcounts

[idzebra-moved-to-github.git] / index / extract.c

diff --git a/index/extract.c b/index/extract.c
index 9561c6e..98cc717 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.158 2004-08-04 08:35:23 adam Exp $
+/* $Id: extract.c,v 1.160 2004-08-10 08:19:15 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -72,7 +72,8 @@ static void logRecord (ZebraHandle zh)
     ++zh->records_processed;
     if (!(zh->records_processed % 1000))
     {
-        logf (LOG_LOG, "Records: %7d i/u/d %d/%d/%d", 
+        logf (LOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
+                       ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, 
               zh->records_processed, zh->records_inserted, zh->records_updated,
               zh->records_deleted);
     }
@@ -114,9 +115,9 @@ static const char **searchRecordKey (ZebraHandle zh,
        iscz1_decode(decode_handle, &dst, &src);
        assert(key.len < 4 && key.len > 2);
 
-       attrSet = key.mem[0];
-       attrUse = key.mem[1];
-       seqno = key.mem[2];
+       attrSet = (int) key.mem[0];
+       attrUse = (int) key.mem[1];
+       seqno = (int) key.mem[2];
 
        if (attrUseS == attrUse && attrSetS == attrSet)
         {
@@ -1331,13 +1332,12 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
        iscz1_decode(decode_handle, &dst, &src);
        assert(key.len < 4 && key.len > 2);
 
-       attrSet = key.mem[0];
-       attrUse = key.mem[1]; /* sequence in mem[2] */
+       attrSet = (int) key.mem[0];
+       attrUse = (int) key.mem[1]; /* sequence in mem[2] */
 
         if (zh->reg->key_buf_used + 1024 > 
             (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
             extract_flushWriteKeys (zh,0);
-        assert(zh->reg->ptr_i >= 0);
         ++(zh->reg->ptr_i);
         assert(zh->reg->ptr_i > 0);
         (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =