-/* $Id: zebraapi.c,v 1.148 2005-01-21 13:23:25 adam Exp $
+/* $Id: zebraapi.c,v 1.154 2005-03-09 12:14:42 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
}
}
+int zebra_select_default_database(ZebraHandle zh)
+{
+ if (!zh->res)
+ {
+ /* no database has been selected - so we select based on
+ resource setting (including group)
+ */
+ const char *group = res_get(zh->service->global_res, "group");
+ const char *v = res_get_prefix(zh->service->global_res,
+ "database", group, "Default");
+ zebra_select_database(zh, v);
+ }
+ return 0;
+}
+
void map_basenames (ZebraHandle zh, ODR stream,
int *num_bases, char ***basenames)
{
zh->errCode = 0;
info.zh = zh;
+
info.num_bases = *num_bases;
info.basenames = *basenames;
info.new_num_max = 128;
}
int zebra_search_RPN (ZebraHandle zh, ODR o,
- Z_RPNQuery *query, const char *setname, int *hits)
+ Z_RPNQuery *query, const char *setname, zint *hits)
{
const char *max;
zint maxhits;
return 0;
}
-int zebra_deleleResultSet(ZebraHandle zh, int function,
+int zebra_deleteResultSet(ZebraHandle zh, int function,
int num_setnames, char **setnames,
int *statuses)
{
int i, status;
ASSERTZH;
- assert(num_setnames>0);
- assert(setnames);
assert(statuses);
- yaz_log(log_level, "zebra_deleleResultSet n=%d",num_setnames);
+ yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
zh->errCode = 0;
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
{
case Z_DeleteResultSetRequest_list:
+ assert(num_setnames>0);
+ assert(setnames);
resultSetDestroy (zh, num_setnames, setnames, statuses);
break;
case Z_DeleteResultSetRequest_all:
int zebra_begin_trans (ZebraHandle zh, int rw)
{
ASSERTZH;
- if (!zh->res)
- {
- /* no database has been selected - so we select based on
- resource setting (including group)
- */
- const char *group = res_get(zh->service->global_res, "group");
- const char *v = res_get_prefix(zh->service->global_res,
- "database", group, "Default");
- zebra_select_database(zh, v);
- }
+ zebra_select_default_database(zh);
if (!zh->res)
{
zh->errCode = 2;
zh->records_processed, zh->records_inserted,
zh->records_updated, zh->records_deleted);
- status->processed = zh->records_processed;
- status->inserted = zh->records_inserted;
- status->updated = zh->records_updated;
- status->deleted = zh->records_deleted;
+ status->processed = (int) zh->records_processed;
+ status->inserted = (int) zh->records_inserted;
+ status->updated = (int) zh->records_updated;
+ status->deleted = (int) zh->records_deleted;
zebra_get_state (zh, &val, &seqno);
if (val != 'd')
ASSERTZH;
zh->errCode = 0;
+ zebra_select_default_database(zh);
if (!zh->res)
{
zh->errCode = 109;
yaz_log(log_level, "zebra_init");
zh->errCode = 0;
+ zebra_select_default_database(zh);
if (!zh->res)
{
zh->errCode = 109;
}
rval = res_get (zh->res, "shadow");
- bfs = bfs_create (res_get (zh->service->global_res, "register"),
- zh->path_reg);
+ bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
if (!bfs)
return -1;
if (rval && *rval)
*/
int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
- const char *setname, int *numhits)
+ const char *setname, zint *numhits)
{
- int hits = 0;
+ zint hits = 0;
int res = -1;
Z_RPNQuery *query;
ODR odr = odr_createmem(ODR_ENCODE);
odr_destroy(odr);
- yaz_log(log_level, "Hits: %d",hits);
+ yaz_log(log_level, "Hits: " ZINT_FORMAT, hits);
if (numhits)
*numhits = hits;