-/* $Id: zebraapi.h,v 1.14 2004-08-04 08:35:23 adam Exp $
+/* $Id: zebraapi.h,v 1.15 2004-08-06 13:36:22 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
int force_update);
YAZ_EXPORT int zebra_resultSetTerms (ZebraHandle zh, const char *setname,
- int no, int *count,
+ int no, zint *count,
int *type, char *out, size_t *len);
YAZ_EXPORT int zebra_sort (ZebraHandle zh, ODR stream,
-/* $Id: extract.c,v 1.158 2004-08-04 08:35:23 adam Exp $
+/* $Id: extract.c,v 1.159 2004-08-06 13:36:22 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
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)
{
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*))
-/* $Id: index.h,v 1.111 2004-08-06 13:14:46 adam Exp $
+/* $Id: index.h,v 1.112 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
typedef struct {
char *term;
char *db;
- int sysno;
+ zint sysno;
int score;
} *ZebraPosSet;
-/* $Id: rank1.c,v 1.15 2004-08-04 08:35:23 adam Exp $
+/* $Id: rank1.c,v 1.16 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
struct rank_term_info {
int local_occur;
- int global_occur;
+ zint global_occur;
int global_inv;
int rank_flag;
int rank_weight;
xmalloc (sizeof(*si->entries)*si->no_entries);
for (i = 0; i < si->no_entries; i++)
{
- int g = rset->rset_terms[i]->nn;
+ zint g = rset->rset_terms[i]->nn;
#if DEBUG_RANK
yaz_log(LOG_LOG, "i=%d flags=%s", i, rset->rset_terms[i]->flags);
#endif
si->entries[i].local_occur = 0;
si->entries[i].global_occur = g;
si->entries[i].global_inv = 32 - log2_int (g);
- yaz_log (LOG_DEBUG, " global_inv = %d g = %d", 32 - log2_int (g), g);
+ yaz_log (LOG_DEBUG, " global_inv = %d g = " ZINT_FORMAT, (int) (32-log2_int (g)), g);
}
return si;
}
-/* $Id: trunc.c,v 1.31 2004-08-06 13:14:46 adam Exp $
+/* $Id: trunc.c,v 1.32 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
{
ISAMC_P i1 = *(ISAMC_P*) p1;
ISAMC_P i2 = *(ISAMC_P*) p2;
- int d;
+ zint d;
- d = (int) (isc_type (i1) - isc_type (i2));
- if (d)
- return d;
- d = isc_block (i1) - isc_block (i2);
+ d = (isc_type (i1) - isc_type (i2));
+ if (d == 0)
+ d = isc_block (i1) - isc_block (i2);
if (d > 0)
return 1;
else if (d < 0)
-/* $Id: zinfo.c,v 1.38 2004-08-04 08:35:23 adam Exp $
+/* $Id: zinfo.c,v 1.39 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
}
}
-int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
+zint zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
{
if (adjust_num)
{
-/* $Id: zinfo.h,v 1.16 2003-06-30 19:37:12 adam Exp $
+/* $Id: zinfo.h,v 1.17 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
void zebraExplain_addSchema (ZebraExplainInfo zei, Odr_oid *oid);
void zebraExplain_recordCountIncrement (ZebraExplainInfo zei, int adjust_num);
void zebraExplain_recordBytesIncrement (ZebraExplainInfo zei, int adjust_num);
-int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num);
+zint zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num);
void zebraExplain_loadAttsets (data1_handle dh, Res res);
void zebraExplain_flush (ZebraExplainInfo zei, void *updateHandle);
-/* $Id: zrpn.c,v 1.142 2004-08-04 08:35:23 adam Exp $
+/* $Id: zrpn.c,v 1.143 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
static void count_set (RSET r, int *count)
{
- int psysno = 0;
+ zint psysno = 0;
int kno = 0;
struct it_key key;
RSFD rfd;
-/* $Id: zserver.c,v 1.118 2004-08-04 08:35:24 adam Exp $
+/* $Id: zserver.c,v 1.119 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
static void search_terms (ZebraHandle zh, bend_search_rr *r)
{
- int count;
+ zint count;
int no_terms;
int i;
int type;
sr->elements[i]->subqueryExpression->u.term->termComment = 0;
sr->elements[i]->subqueryInterpretation = 0;
sr->elements[i]->subqueryRecommendation = 0;
- sr->elements[i]->subqueryCount = odr_intdup (r->stream, count);
+ if (count > 2000000000)
+ count = 2000000000;
+ sr->elements[i]->subqueryCount = odr_intdup (r->stream, (int) count);
sr->elements[i]->subqueryWeight = 0;
sr->elements[i]->resultsByDB = 0;
}
-/* $Id: zsets.c,v 1.53 2004-08-06 12:55:01 adam Exp $
+/* $Id: zsets.c,v 1.54 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
int zebra_resultSetTerms (ZebraHandle zh, const char *setname,
- int no, int *count,
+ int no, zint *count,
int *type, char *out, size_t *len)
{
ZebraSet s = resultSetGet (zh, setname);
-/* $Id: isams.c,v 1.6 2004-08-04 08:35:24 adam Exp $
+/* $Id: isams.c,v 1.7 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
pp->numKeys = 0;
pp->numRead = 0;
pp->buf = (char *) xmalloc(is->block_size*2);
- pp->block_no = pos/is->block_size;
- pp->block_offset = pos - pp->block_no * is->block_size;
+ pp->block_no = (int) (pos/is->block_size);
+ pp->block_offset = (int) (pos - pp->block_no * is->block_size);
if (is->debug)
logf (LOG_LOG, "isams: isams_pp_open off=%d no=%d",
pp->block_offset, pp->block_no);
-/* $Id: recgrs.c,v 1.87 2004-08-06 12:55:03 adam Exp $
+/* $Id: recgrs.c,v 1.88 2004-08-06 13:36:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
data1_mk_tag_data_int (p->dh, n, "score", p->score, mem);
}
data1_mk_text (p->dh, mem, i4, n);
- data1_mk_tag_data_int (p->dh, n, "localnumber", p->localno, mem);
+ data1_mk_tag_data_zint (p->dh, n, "localnumber", p->localno, mem);
if (p->fname)
{
data1_mk_text (p->dh, mem, i4, n);
-/* $Id: rsprox.c,v 1.6 2004-08-04 09:59:03 heikki Exp $
+/* $Id: rsprox.c,v 1.7 2004-08-06 13:36:24 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
int i;
char prox_term[512];
int length_prox_term = 0;
- int min_nn = 10000000;
+ zint min_nn = 10000000;
const char *flags = NULL;
int term_type = 0;