projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Limiting hits to INT_MAX, because yaz can't handle 64-bit hitcounts
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
b99874f
..
149d40c
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.121 2004-08-04 08:35:23 adam Exp $
+/* $Id: zebraapi.c,v 1.125 2004-08-10 08:54:39 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-22,6
+22,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
+#include <limits.h>
#ifdef WIN32
#include <io.h>
#include <process.h>
#ifdef WIN32
#include <io.h>
#include <process.h>
@@
-261,7
+262,6
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
reg->sortIdx = 0;
reg->isams = 0;
reg->matchDict = 0;
reg->sortIdx = 0;
reg->isams = 0;
reg->matchDict = 0;
- reg->isam = 0;
reg->isamc = 0;
reg->isamb = 0;
reg->zei = 0;
reg->isamc = 0;
reg->isamb = 0;
reg->zei = 0;
@@
-308,15
+308,6
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
return 0;
}
}
return 0;
}
}
- if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
- {
- if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
- sizeof (struct it_key), res)))
- {
- logf (LOG_WARN, "is_open");
- return 0;
- }
- }
if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
{
struct ISAMC_M_s isamc_m;
if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
{
struct ISAMC_M_s isamc_m;
@@
-412,8
+403,6
@@
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
sortIdx_close (reg->sortIdx);
if (reg->isams)
isams_close (reg->isams);
sortIdx_close (reg->sortIdx);
if (reg->isams)
isams_close (reg->isams);
- if (reg->isam)
- is_close (reg->isam);
if (reg->isamc)
isc_close (reg->isamc);
if (reg->isamb)
if (reg->isamc)
isc_close (reg->isamc);
if (reg->isamb)
@@
-792,8
+781,10
@@
int zebra_search_RPN (ZebraHandle zh, ODR o,
zh->num_basenames, zh->basenames, setname);
zebra_end_read (zh);
zh->num_basenames, zh->basenames, setname);
zebra_end_read (zh);
-
- *hits = zh->hits;
+ if (zh->hits > INT_MAX)
+ *hits=INT_MAX;
+ else
+ *hits = zh->hits;
return 0;
}
return 0;
}
@@
-1573,7
+1564,8
@@
int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
zebra_register_close (zh->service, zh->reg);
zh->reg = 0;
zebra_register_close (zh->service, zh->reg);
zh->reg = 0;
- yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d",
+ yaz_log (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);
zh->records_processed, zh->records_inserted,
zh->records_updated, zh->records_deleted);
@@
-1992,7
+1984,6
@@
int zebra_update_record (ZebraHandle zh,
match, fname,
force_update,
1); /* allow_update */
match, fname,
force_update,
1); /* allow_update */
- yaz_log(LOG_LOG, "zebra_update_record returned res=%d", res);
zebra_end_trans(zh);
return res;
}
zebra_end_trans(zh);
return res;
}