-/* $Id: zebraapi.c,v 1.198 2005-12-09 10:56:59 adam Exp $
+/* $Id: zebraapi.c,v 1.218 2006-05-18 12:03:05 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include "index.h"
+#include "rank.h"
+#include "orddict.h"
#include <charmap.h>
#include <idzebra/api.h>
static void zebra_open_res(ZebraHandle zh);
static void zebra_close_res(ZebraHandle zh);
+static ZEBRA_RES zebra_check_handle(ZebraHandle zh)
+{
+ if (zh)
+ return ZEBRA_OK;
+ return ZEBRA_FAIL;
+}
+
+#define ZEBRA_CHECK_HANDLE(zh) if (zebra_check_handle(zh) != ZEBRA_OK) return ZEBRA_FAIL
+
static void zebra_chdir (ZebraService zs)
{
const char *dir ;
#endif
}
-static void zebra_flush_reg (ZebraHandle zh)
+static ZEBRA_RES zebra_flush_reg (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_flush_reg");
- zebra_clearError(zh);
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh, 1 /* final */);
zebra_index_merge (zh );
+ return ZEBRA_OK;
}
static struct zebra_register *zebra_register_open(ZebraService zs,
int rw, int useshadow,
Res res,
const char *reg_path);
-static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
+static void zebra_register_close(ZebraService zs, struct zebra_register *reg);
ZebraHandle zebra_open(ZebraService zs, Res res)
{
const char *passwd_plain = 0;
const char *passwd_encrypt = 0;
const char *dbaccess = 0;
- ZebraService zh = xmalloc(sizeof(*zh));
+ ZebraService zh = 0;
if (configName)
- res_read_file(res, configName);
-
+ {
+ ZEBRA_RES ret = res_read_file(res, configName);
+ if (ret != ZEBRA_OK)
+ {
+ res_close(res);
+ return 0;
+ }
+ }
+ zh = xmalloc(sizeof(*zh));
zh->global_res = res;
zh->sessions = 0;
zh->path_root = res_get (zh->global_res, "root");
zh->nmem = nmem_create();
zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
+
+ if (1)
+ {
+ const char *module_path = res_get(res, "modulePath");
+ if (module_path)
+ recTypeClass_load_modules(&zh->record_classes, zh->nmem,
+ module_path);
+ }
return zh;
}
return 0;
const char *recordCompression = 0;
const char *profilePath;
char cwd[1024];
+ ZEBRA_RES ret = ZEBRA_OK;
ASSERTZS;
yaz_log (YLOG_DEBUG, "zebra_register_open rw=%d useshadow=%d p=%p n=%s rp=%s",
rw, useshadow, reg, name, reg_path ? reg_path : "(none)");
- reg->dh = data1_createx (DATA1_FLAG_XML);
+ reg->dh = data1_create();
if (!reg->dh)
{
+ xfree(reg->name);
xfree(reg);
return 0;
}
if (!reg->bfs)
{
data1_destroy(reg->dh);
+ xfree(reg->name);
xfree(reg);
return 0;
}
{
bfs_destroy(reg->bfs);
data1_destroy(reg->dh);
+ xfree(reg->name);
xfree(reg);
return 0;
}
data1_set_tabroot (reg->dh, reg_path);
reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
- reg->zebra_maps = zebra_maps_open (res, reg_path);
+ reg->zebra_maps =
+ zebra_maps_open(res, reg_path, profilePath);
+ if (!reg->zebra_maps)
+ {
+ recTypes_destroy(reg->recTypes);
+ bfs_destroy(reg->bfs);
+ data1_destroy(reg->dh);
+ xfree(reg->name);
+ xfree(reg);
+ return 0;
+ }
reg->rank_classes = NULL;
reg->key_buf = 0;
reg->keys = zebra_rec_keys_open();
-#if NATTR
reg->sortKeys = zebra_rec_keys_open();
-#else
- reg->sortKeys.buf = 0;
- reg->sortKeys.buf_max = 0;
-#endif
reg->records = 0;
reg->dict = 0;
reg->isamc = 0;
reg->isamb = 0;
reg->zei = 0;
- reg->matchDict = 0;
reg->key_file_no = 0;
reg->ptr_i = 0;
+ /* installing rank classes */
zebraRankInstall (reg, rank_1_class);
zebraRankInstall (reg, rank_zv_class);
+ zebraRankInstall (reg, rank_similarity_class);
zebraRankInstall (reg, rank_static_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "bzip2"))
record_compression = REC_COMPRESS_BZIP2;
+ if (1)
+ {
+ const char *index_fname = res_get_def(res, "index", "default.idx");
+ if (index_fname && *index_fname)
+ {
+ if (zebra_maps_read_file(reg->zebra_maps, index_fname) != ZEBRA_OK)
+ ret = ZEBRA_FAIL;
+ }
+ }
+
if (!(reg->records = rec_open (reg->bfs, rw, record_compression)))
{
yaz_log (YLOG_WARN, "rec_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
if (rw)
{
if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res)))
{
yaz_log (YLOG_WARN, "dict_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw)))
{
yaz_log (YLOG_WARN, "sortIdx_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
if (res_get_match (res, "isam", "s", ISAM_DEFAULT))
{
key_isams_m(res, &isams_m))))
{
yaz_log (YLOG_WARN, "isams_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m))))
{
yaz_log (YLOG_WARN, "isamc_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "b", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m), 0)))
{
yaz_log (YLOG_WARN, "isamb_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "bc", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m), 1)))
{
yaz_log (YLOG_WARN, "isamb_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
if (res_get_match (res, "isam", "null", ISAM_DEFAULT))
rw, key_isamc_m(res, &isamc_m), -1)))
{
yaz_log (YLOG_WARN, "isamb_open failed");
- return 0;
+ ret = ZEBRA_FAIL;
}
}
- reg->zei = zebraExplain_open (reg->records, reg->dh,
- res, rw, reg,
- explain_extract);
- if (!reg->zei)
+ if (ret == ZEBRA_OK)
+ {
+ reg->zei = zebraExplain_open(reg->records, reg->dh,
+ res, rw, reg,
+ explain_extract);
+ if (!reg->zei)
+ {
+ yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
+ ret = ZEBRA_FAIL;
+ }
+ }
+
+ if (ret != ZEBRA_OK)
{
- yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
+ zebra_register_close(zs, reg);
return 0;
}
- reg->active = 2;
yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg);
return reg;
}
ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_shutdown");
- zebra_clearError(zh);
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
ZEBRA_RES zebra_admin_start (ZebraHandle zh)
{
ZebraService zs;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_start");
- zebra_clearError(zh);
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
zebra_mutex_cond_unlock (&zs->session_lock);
return ZEBRA_OK;
}
-static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
+static void zebra_register_close(ZebraService zs, struct zebra_register *reg)
{
ASSERTZS;
assert(reg);
yaz_log(YLOG_DEBUG, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
- if (reg->records)
- {
- zebraExplain_close (reg->zei);
- dict_close (reg->dict);
- if (reg->matchDict)
- dict_close (reg->matchDict);
- sortIdx_close (reg->sortIdx);
- if (reg->isams)
- isams_close (reg->isams);
- if (reg->isamc)
- isamc_close (reg->isamc);
- if (reg->isamb)
- isamb_close (reg->isamb);
- rec_close (®->records);
- }
+
+ zebraExplain_close (reg->zei);
+ dict_close (reg->dict);
+ if (reg->matchDict)
+ dict_close (reg->matchDict);
+ sortIdx_close (reg->sortIdx);
+ if (reg->isams)
+ isams_close (reg->isams);
+ if (reg->isamc)
+ isamc_close (reg->isamc);
+ if (reg->isamb)
+ isamb_close (reg->isamb);
+ rec_close (®->records);
recTypes_destroy (reg->recTypes);
zebra_maps_close (reg->zebra_maps);
data1_destroy (reg->dh);
zebra_rec_keys_close(reg->keys);
-#if NATTR
zebra_rec_keys_close(reg->sortKeys);
-#else
- xfree(reg->sortKeys.buf);
-#endif
xfree(reg->key_buf);
xfree(reg->name);
int i;
yaz_log(log_level, "zebra_close");
- if (!zh)
- return ZEBRA_OK;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
zh->errCode = 0;
zs = zh->service;
resultSetDestroy (zh, -1, 0, 0);
if (zh->reg)
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
zebra_close_res (zh);
res_close(zh->session_res);
if (zh->reg)
{
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
zh->reg = 0;
}
zebra_close_res(zh);
res_set (zh->res, "lockDir", zh->path_reg);
sprintf (fname, "norm.%s.LCK", zh->reg_name);
zh->lock_normal =
- zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+ zebra_lock_create (res_get(zh->res, "lockDir"), fname);
sprintf (fname, "shadow.%s.LCK", zh->reg_name);
zh->lock_shadow =
- zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+ zebra_lock_create (res_get(zh->res, "lockDir"), fname);
if (!zh->lock_normal || !zh->lock_shadow)
{
{
if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
- else
- yaz_log(YLOG_LOG, "static rank unset");
}
}
ZEBRA_RES zebra_select_database (ZebraHandle zh, const char *basename)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
yaz_log(log_level, "zebra_select_database %s",basename);
assert(basename);
return zebra_select_databases (zh, 1, &basename);
const char *cp;
int len = 0;
char *new_reg = 0;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(basenames);
yaz_log(log_level, "zebra_select_databases n=%d [0]=%s",
const char *setname, zint *hits)
{
ZEBRA_RES r;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(o);
assert(query);
assert(hits);
assert(setname);
yaz_log(log_level, "zebra_search_rpn");
- zebra_clearError(zh);
zh->hits = 0;
*hits = 0;
int i;
ZEBRA_RES ret = ZEBRA_OK;
zint *pos_array;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(setname);
assert(recs);
yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs);
- zebra_clearError(zh);
if (!zh->res)
{
zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
{
ZEBRA_RES res;
RSET limit_rset = 0;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(stream);
assert(zapt);
assert(position);
int *sort_status)
{
ZEBRA_RES res;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(num_input_setnames>0);
assert(input_setnames);
ASSERTZH;
assert(statuses);
yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
- zebra_clearError(zh);;
+
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
return a;
}
-void zebra_clearError(ZebraHandle zh)
-{
- if (zh)
- {
- zh->errCode = 0;
- zh->errString = 0;
- }
-}
-
ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
{
const char *p;
char u[40];
ZebraService zs;
- ASSERTZH;
- zebra_clearError(zh);
- zs= zh->service;
+ ZEBRA_CHECK_HANDLE(zh);
+
+ zs = zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
p = res_get(zs->global_res, u);
ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
const char *record_type)
{
- ASSERTZH;
yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s",
database, record_type);
- zebra_clearError(zh);
if (zebra_select_database(zh, database) == ZEBRA_FAIL)
return ZEBRA_FAIL;
return zebra_begin_trans(zh, 1);
ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_import_end");
- zebra_clearError(zh);
return zebra_end_trans(zh);
}
ZEBRA_RES res = ZEBRA_OK;
SYSNO sysno;
int i;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_import_segment");
- zebra_clearError(zh);
+
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
return res;
}
-ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
- const char *rec_buf,
- size_t rec_len,
- const char *recid_buf, size_t recid_len,
- int action)
+ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
+ const char *rec_buf,
+ size_t rec_len,
+ const char *recid_buf, size_t recid_len,
+ int action)
/* 1 = insert. Fail it already exists */
/* 2 = replace. Fail it does not exist */
/* 3 = delete. Fail if does not exist */
SYSNO sysno = 0;
char *rinfo = 0;
char recid_z[256];
- ASSERTZH;
+ int db_ord;
+ ZEBRA_CHECK_HANDLE(zh);
assert(action>0 && action <=4);
assert(rec_buf);
yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
- zebra_clearError(zh);
if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
{
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- rinfo = dict_lookup (zh->reg->matchDict, recid_z);
+ db_ord = zebraExplain_get_database_ord(zh->reg->zei);
+ rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, recid_z);
if (rinfo)
{
if (action == 1) /* fail if insert */
{
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
"Cannot insert record: already exist");
return ZEBRA_FAIL;
{
if (action == 2 || action == 3) /* fail if delete or update */
{
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
"Cannot delete/update record: does not exist");
return ZEBRA_FAIL;
}
if (action == 1)
{
- dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
+ dict_insert_ord(zh->reg->matchDict, db_ord, recid_z,
+ sizeof(sysno), &sysno);
}
else if (action == 3)
{
- dict_delete (zh->reg->matchDict, recid_z);
+ dict_delete_ord(zh->reg->matchDict, db_ord, recid_z);
+ }
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
}
- zebra_end_trans(zh);
return res;
}
ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
{
ZEBRA_RES ret = ZEBRA_OK;
- ASSERTZH;
+
yaz_log(log_level, "zebra_drop_database %s", db);
+ ZEBRA_CHECK_HANDLE(zh);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
return ZEBRA_FAIL;
if (zh->reg->isamb)
{
+ int db_ord;
zebraExplain_curDatabase (zh->reg->zei, db);
-
+ db_ord = zebraExplain_get_database_ord(zh->reg->zei);
+ dict_delete_subtree_ord(zh->reg->matchDict, db_ord,
+ 0 /* handle */, 0 /* func */);
zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
zebraExplain_removeDatabase(zh->reg->zei, zh);
}
"drop database only supported for isam:b");
ret = ZEBRA_FAIL;
}
- zebra_end_trans (zh);
+ if (zebra_end_trans (zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ ret = ZEBRA_FAIL;
+ }
return ret;
}
ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
{
- ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", db);
+ ZEBRA_CHECK_HANDLE(zh);
assert(db);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
if (zebraExplain_newDatabase (zh->reg->zei, db, 0
/* explainDatabase */))
{
- zebra_end_trans (zh);
+ if (zebra_end_trans (zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ }
zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, db);
return ZEBRA_FAIL;
}
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
zebra_select_default_database(zh);
if (!zh->res)
{
if (zh->reg)
{
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
}
zh->trans_w_no = zh->trans_no;
yaz_log (YLOG_WARN, "previous transaction didn't reach commit");
bf_commitClean (bfs, rval);
bfs_destroy (bfs);
- }
+ }
else
{
yaz_log (YLOG_WARN, "your previous transaction didn't finish");
yaz_log(YLOG_FATAL, "%s", zh->errString);
return ZEBRA_FAIL;
}
+ zebraExplain_curDatabase(zh->reg->zei, zh->basenames[0]);
}
else
{
if (zh->trans_no != 1)
{
- zebra_flush_reg (zh);
- return ZEBRA_OK;
+ return zebra_flush_reg (zh);
}
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
if (zh->reg)
{
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
}
zh->reg = zebra_register_open(zh->service, zh->reg_name,
0, val == 'c' ? 1 : 0,
ZEBRA_RES zebra_end_trans (ZebraHandle zh)
{
ZebraTransactionStatus dummy;
- ASSERTZH;
+
yaz_log(log_level, "zebra_end_trans");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_end_transaction(zh, &dummy);
}
int seqno;
const char *rval;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(status);
yaz_log(log_level, "zebra_end_transaction");
resultSetInvalidate (zh);
- zebra_register_close (zh->service, zh->reg);
+ zebra_register_close(zh->service, zh->reg);
zh->reg = 0;
yaz_log (YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
{
ASSERTZH;
assert(path);
- zebra_clearError(zh);
yaz_log (log_level, "updating %s", path);
repositoryUpdate (zh, path);
- return zh->errCode;
+ return 0;
}
int zebra_repository_delete (ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
- zebra_clearError(zh);
yaz_log (log_level, "deleting %s", path);
repositoryDelete (zh, path);
- return zh->errCode;
+ return 0;
}
int zebra_repository_show (ZebraHandle zh, const char *path)
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
- zebra_clearError(zh);
repositoryShow (zh, path);
- return zh->errCode;
+ return 0;
}
-static int zebra_commit_ex(ZebraHandle zh, int clean_only)
+static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
{
int seqno;
char val;
const char *rval;
BFiles bfs;
ASSERTZH;
- zebra_clearError(zh);
zebra_select_default_database(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
- return -1;
+ return ZEBRA_FAIL;
}
rval = res_get (zh->res, "shadow");
if (!rval)
{
yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined");
- return 0;
+ return ZEBRA_OK;
}
zebra_lock_w (zh->lock_normal);
zebra_lock_r (zh->lock_shadow);
bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
-
+ if (!bfs)
+ {
+ zebra_unlock(zh->lock_shadow);
+ zebra_unlock(zh->lock_normal);
+ return ZEBRA_FAIL;
+ }
zebra_get_state (zh, &val, &seqno);
if (rval && *rval)
sync ();
#endif
}
- yaz_log (YLOG_DEBUG, "commit clean");
- bf_commitClean (bfs, rval);
seqno++;
zebra_set_state (zh, 'o', seqno);
+
+ zebra_unlock (zh->lock_shadow);
+ zebra_unlock (zh->lock_normal);
+
+ zebra_lock_w(zh->lock_shadow);
+ bf_commitClean (bfs, rval);
+ zebra_unlock (zh->lock_normal);
}
else
{
+ zebra_unlock(zh->lock_shadow);
+ zebra_unlock(zh->lock_normal);
yaz_log (log_level, "nothing to commit");
}
bfs_destroy (bfs);
- zebra_unlock (zh->lock_shadow);
- zebra_unlock (zh->lock_normal);
- return 0;
+ return ZEBRA_OK;
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_clean");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_commit_ex(zh, 1);
}
ZEBRA_RES zebra_commit(ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_commit");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_commit_ex(zh, 0);
}
+
ZEBRA_RES zebra_init(ZebraHandle zh)
{
const char *rval;
BFiles bfs = 0;
- ASSERTZH;
+
yaz_log(log_level, "zebra_init");
- zebra_clearError(zh);
+
+ ZEBRA_CHECK_HANDLE(zh);
zebra_select_default_database(zh);
if (!zh->res)
ZEBRA_RES zebra_compact(ZebraHandle zh)
{
BFiles bfs;
- ASSERTZH;
+
yaz_log(log_level, "zebra_compact");
- zebra_clearError(zh);
+ ZEBRA_CHECK_HANDLE(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
void zebra_result(ZebraHandle zh, int *code, char **addinfo)
{
- ASSERTZH;
yaz_log(log_level, "zebra_result");
- *code = zh->errCode;
- *addinfo = zh->errString;
+ if (zh)
+ {
+ *code = zh->errCode;
+ *addinfo = zh->errString;
+ }
+ else
+ {
+ *code = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo ="ZebraHandle is NULL";
+ }
}
void zebra_shadow_enable(ZebraHandle zh, int value)
{
ASSERTZH;
yaz_log(log_level, "zebra_shadow_enable");
- zebra_clearError(zh);
zh->shadow_enable = value;
}
ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
{
- ASSERTZH;
- assert(encoding);
yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
- zebra_clearError(zh);
+ ZEBRA_CHECK_HANDLE(zh);
+ assert(encoding);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
- ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
- zebra_clearError(zh);
+ ZEBRA_CHECK_HANDLE(zh);
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
{
- ASSERTZH;
assert(name);
assert(value);
yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
- zebra_clearError(zh);
+ ASSERTZH;
res_set(zh->res, name, value);
}
ASSERTZH;
assert(name);
v = res_get_def (zh->res, name, (char *)defaultvalue);
- zebra_clearError(zh);
yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
return v;
}
int zebra_trans_no (ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_trans_no");
+ ASSERTZH;
return zh->trans_no;
}
int zebra_get_shadow_enable (ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_get_shadow_enable");
+ ASSERTZH;
return zh->shadow_enable;
}
void zebra_set_shadow_enable (ZebraHandle zh, int value)
{
- ASSERTZH;
yaz_log(log_level, "zebra_set_shadow_enable %d",value);
+ ASSERTZH;
zh->shadow_enable = value;
}
match, fname,
0,
0); /* allow_update */
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
+ }
return res;
}
int force_update)
{
ZEBRA_RES res;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(buf);
yaz_log(log_level, "zebra_update_record");
match, fname,
force_update,
1); /* allow_update */
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
+ }
return res;
}
int force_update)
{
ZEBRA_RES res;
- ASSERTZH;
- assert(sysno);
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(buf);
- yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+ yaz_log(log_level, "zebra_delete_record");
+ if (sysno)
+ yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
match,fname,
force_update,
1); /* allow_update */
- zebra_end_trans(zh);
+ if (zebra_end_trans(zh) != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "zebra_end_trans failed");
+ res = ZEBRA_FAIL;
+ }
return res;
}
zint lhits = 0;
ZEBRA_RES res = ZEBRA_OK;
Z_RPNQuery *query;
- ODR odr = odr_createmem(ODR_ENCODE);
- ASSERTZH;
+ ODR odr;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
+ odr = odr_createmem(ODR_ENCODE);
+
assert(pqf_query);
assert(setname);
int num_input_setnames = 0;
int sort_status = 0;
Z_SortKeySpecList *sort_sequence;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(sort_spec);
assert(output_setname);
*/
ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
zebra_limit_destroy(zh->m_limit);
zh->m_limit = zebra_limit_create(complement_flag, ids);
return ZEBRA_OK;
*/
void zebra_setError(ZebraHandle zh, int code, const char *addinfo)
{
+ if (!zh)
+ return;
zh->errCode = code;
nmem_reset(zh->nmem_error);
zh->errString = addinfo ? nmem_strdup(zh->nmem_error, addinfo) : 0;
zh->errString = nmem_strdup(zh->nmem_error, vstr);
}
+void zebra_lock_prefix (Res res, char *path)
+{
+ const char *lock_dir = res_get_def (res, "lockDir", "");
+
+ strcpy (path, lock_dir);
+ if (*path && path[strlen(path)-1] != '/')
+ strcat (path, "/");
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+