X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=9a24d0ebf95b5ae9d62a659d2d9aaada1b889803;hp=6a3069aa185907a63960ca8a2b88f51a582e2c88;hb=ec6ef89747394edb31aedfce9d585b5b34191154;hpb=2fefff35eeb40ba802bb3ee11674a6037b84659c diff --git a/index/zebraapi.c b/index/zebraapi.c index 6a3069a..6415172 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,8 +1,5 @@ -/* $Id: zebraapi.c,v 1.138 2004-10-28 10:37:15 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -15,11 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -27,7 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#else +#endif +#if HAVE_UNISTD_H #include #endif @@ -35,65 +36,96 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include "index.h" +#include "rank.h" +#include "orddict.h" #include #include +#include + +#define DEFAULT_APPROX_LIMIT 2000000000 /* simple asserts to validate the most essential input args */ #define ASSERTZH assert(zh && zh->service) #define ASSERTZHRES assert(zh && zh->service && zh->res) #define ASSERTZS assert(zs) -#define LOG_API LOG_APP2 +static int log_level = 0; +static int log_level_initialized = 0; -static Res zebra_open_res (ZebraHandle zh); -static void zebra_close_res (ZebraHandle zh); +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) +static int zebra_chdir(ZebraService zs) { const char *dir ; + int r; ASSERTZS; - yaz_log(LOG_API,"zebra_chdir"); - dir = res_get (zs->global_res, "chdir"); + yaz_log(log_level, "zebra_chdir"); + dir = res_get(zs->global_res, "chdir"); if (!dir) - return; - logf (LOG_DEBUG, "chdir %s", dir); + return 0; + yaz_log(YLOG_DEBUG, "chdir %s", dir); #ifdef WIN32 - _chdir(dir); + r = _chdir(dir); #else - chdir (dir); + r = chdir(dir); #endif + if (r) + yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", dir); + return r; } -static void zebra_flush_reg (ZebraHandle zh) +static ZEBRA_RES zebra_flush_reg(ZebraHandle zh) { - ASSERTZH; - yaz_log(LOG_API,"zebra_flush_reg"); - zh->errCode=0; - zebraExplain_flush (zh->reg->zei, zh); - - extract_flushWriteKeys (zh,1 /* final */); - zebra_index_merge (zh ); + ZEBRA_CHECK_HANDLE(zh); + yaz_log(log_level, "zebra_flush_reg"); + zebraExplain_flush(zh->reg->zei, zh); + + key_block_flush(zh->reg->key_block, 1); + + zebra_index_merge(zh); + return ZEBRA_OK; } -static struct zebra_register *zebra_register_open (ZebraService zs, - const char *name, - int rw, int useshadow, - Res res, - const char *reg_path); -static void zebra_register_close (ZebraService zs, struct zebra_register *reg); +static struct zebra_register *zebra_register_open(ZebraService zs, + const char *name, + int rw, int useshadow, + Res res, + const char *reg_path); +static void zebra_register_close(ZebraService zs, struct zebra_register *reg); -ZebraHandle zebra_open (ZebraService zs) +const char *zebra_get_encoding(ZebraHandle zh) +{ + assert(zh && zh->session_res); + return res_get_def(zh->session_res, "encoding", "ISO-8859-1"); +} + +ZebraHandle zebra_open(ZebraService zs, Res res) { ZebraHandle zh; const char *default_encoding; - yaz_log(LOG_API,"zebra_open"); + if (!log_level_initialized) + { + log_level = yaz_log_module_level("zebraapi"); + log_level_initialized = 1; + } + + yaz_log(log_level, "zebra_open"); if (!zs) return 0; - zh = (ZebraHandle) xmalloc (sizeof(*zh)); - yaz_log (LOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); + zh = (ZebraHandle) xmalloc(sizeof(*zh)); + yaz_log(YLOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); zh->service = zs; zh->reg = 0; /* no register attached yet */ @@ -102,13 +134,16 @@ ZebraHandle zebra_open (ZebraService zs) zh->errCode = 0; zh->errString = 0; zh->res = 0; + zh->session_res = res_open(zs->global_res, res); zh->user_perm = 0; + zh->dbaccesslist = 0; - zh->reg_name = xstrdup (""); + zh->reg_name = xstrdup(""); zh->path_reg = 0; zh->num_basenames = 0; zh->basenames = 0; + zh->approx_limit = DEFAULT_APPROX_LIMIT; zh->trans_no = 0; zh->trans_w_no = 0; @@ -116,77 +151,157 @@ ZebraHandle zebra_open (ZebraService zs) zh->lock_shadow = 0; zh->shadow_enable = 1; + zh->m_staticrank = 0; + zh->m_segment_indexing = 0; - default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1"); - zh->record_encoding = xstrdup (default_encoding); + zh->break_handler_func = 0; + zh->break_handler_data = 0; + + default_encoding = zebra_get_encoding(zh); zh->iconv_to_utf8 = - yaz_iconv_open ("UTF-8", default_encoding); + yaz_iconv_open("UTF-8", default_encoding); if (zh->iconv_to_utf8 == 0) - yaz_log (LOG_WARN, "iconv: %s to UTF-8 unsupported", - default_encoding); + yaz_log(YLOG_WARN, "iconv: %s to UTF-8 unsupported", + default_encoding); zh->iconv_from_utf8 = - yaz_iconv_open (default_encoding, "UTF-8"); + yaz_iconv_open(default_encoding, "UTF-8"); if (zh->iconv_to_utf8 == 0) - yaz_log (LOG_WARN, "iconv: UTF-8 to %s unsupported", - default_encoding); + yaz_log(YLOG_WARN, "iconv: UTF-8 to %s unsupported", + default_encoding); + + zh->record_encoding = 0; - zebra_mutex_cond_lock (&zs->session_lock); + zebra_mutex_cond_lock(&zs->session_lock); zh->next = zs->sessions; zs->sessions = zh; - zebra_mutex_cond_unlock (&zs->session_lock); + zebra_mutex_cond_unlock(&zs->session_lock); + + zh->store_data_buf = 0; + + zh->m_limit = zebra_limit_create(1, 0); + + zh->nmem_error = nmem_create(); return zh; } -ZebraService zebra_start (const char *configName) +ZebraService zebra_start(const char *configName) { return zebra_start_res(configName, 0, 0); } -ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) +ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) { Res res; + char version_str[16]; + char system_str[80]; - yaz_log(LOG_API,"zebra_start %s",configName); - assert(configName); + zebra_flock_init(); - if ((res = res_open (configName, def_res, over_res))) + if (!log_level_initialized) { - ZebraService zh = xmalloc (sizeof(*zh)); + log_level = yaz_log_module_level("zebraapi"); + log_level_initialized = 1; + } - yaz_log (LOG_DEBUG, "Read resources `%s'", configName); - + *system_str = '\0'; + *version_str = '\0'; + zebra_get_version(version_str, system_str); + + yaz_log(YLOG_LOG, "zebra_start %s %s", version_str, system_str); + if (configName) + yaz_log(YLOG_LOG, "config %s", configName); + + if ((res = res_open(def_res, over_res))) + { + const char *passwd_plain = 0; + const char *passwd_encrypt = 0; + const char *dbaccess = 0; + ZebraService zh = 0; + + if (configName) + { + ZEBRA_RES ret = res_read_file(res, configName); + if (ret != ZEBRA_OK) + { + res_close(res); + return 0; + } + if (zebra_check_res(res)) + { + yaz_log(YLOG_FATAL, "Configuration error(s) for %s", + configName); + return 0; + } + } + else + { + zebra_check_res(res); + } + + zh = xmalloc(sizeof(*zh)); zh->global_res = res; - zh->configName = xstrdup(configName); zh->sessions = 0; - zebra_chdir (zh); + if (zebra_chdir(zh)) + { + xfree(zh); + return 0; + } - zebra_mutex_cond_init (&zh->session_lock); - if (!res_get (zh->global_res, "passwd")) + zebra_mutex_cond_init(&zh->session_lock); + passwd_plain = res_get(zh->global_res, "passwd"); + passwd_encrypt = res_get(zh->global_res, "passwd.c"); + dbaccess = res_get(zh->global_res, "dbaccess"); + + if (!passwd_plain && !passwd_encrypt) zh->passwd_db = NULL; - else + else { - zh->passwd_db = passwd_db_open (); + zh->passwd_db = passwd_db_open(); if (!zh->passwd_db) - logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed"); + yaz_log(YLOG_WARN|YLOG_ERRNO, "passwd_db_open failed"); else - passwd_db_file (zh->passwd_db, - res_get (zh->global_res, "passwd")); + { + if (passwd_plain) + passwd_db_file_plain(zh->passwd_db, passwd_plain); + if (passwd_encrypt) + passwd_db_file_crypt(zh->passwd_db, passwd_encrypt); + } } - zh->path_root = res_get (zh->global_res, "root"); + + if (!dbaccess) + zh->dbaccess = NULL; + else { + zh->dbaccess = res_open(NULL, NULL); + if (res_read_file(zh->dbaccess, dbaccess) != ZEBRA_OK) { + yaz_log(YLOG_FATAL, "Failed to read %s", dbaccess); + return NULL; + } + } + + zh->timing = yaz_timing_create(); + zh->path_root = res_get(zh->global_res, "root"); zh->nmem = nmem_create(); - zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem); + 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; } void zebra_filter_info(ZebraService zs, void *cd, - void (*cb)(void *cd, const char *name)) + void(*cb)(void *cd, const char *name)) { ASSERTZS; assert(cb); @@ -196,319 +311,386 @@ void zebra_filter_info(ZebraService zs, void *cd, void zebra_pidfname(ZebraService zs, char *path) { ASSERTZS; - zebra_lock_prefix (zs->global_res, path); + zebra_lock_prefix(zs->global_res, path); strcat(path, "zebrasrv.pid"); } -Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw, - int compact_flag, Res res) +Dict dict_open_res(BFiles bfs, const char *name, int cache, int rw, + int compact_flag, Res res) { int page_size = 4096; char resource_str[200]; - const char *v; - sprintf (resource_str, "dict.%.100s.pagesize", name); + sprintf(resource_str, "dict.%.100s.pagesize", name); assert(bfs); assert(name); - v = res_get(res, resource_str); - if (v) - { - page_size = atoi(v); - yaz_log(LOG_LOG, "Using custom dictionary page size %d for %s", + if (res_get_int(res, resource_str, &page_size) == ZEBRA_OK) + yaz_log(YLOG_LOG, "Using custom dictionary page size %d for %s", page_size, name); - } return dict_open(bfs, name, cache, rw, compact_flag, page_size); } - static -struct zebra_register *zebra_register_open (ZebraService zs, const char *name, - int rw, int useshadow, Res res, - const char *reg_path) +struct zebra_register *zebra_register_open(ZebraService zs, const char *name, + int rw, int useshadow, Res res, + const char *reg_path) { struct zebra_register *reg; int record_compression = REC_COMPRESS_NONE; - const char *recordCompression = 0; + const char *compression_str = 0; const char *profilePath; - char cwd[1024]; + int sort_type = ZEBRA_SORT_TYPE_FLAT; + ZEBRA_RES ret = ZEBRA_OK; ASSERTZS; - reg = xmalloc (sizeof(*reg)); + reg = xmalloc(sizeof(*reg)); - assert (name); - reg->name = xstrdup (name); + assert(name); + reg->name = xstrdup(name); reg->seqno = 0; reg->last_val = 0; - assert (res); + assert(res); - yaz_log (LOG_DEBUG, "zebra_register_open rw=%d useshadow=%d p=%p n=%s rp=%s", - rw, useshadow, reg, name, reg_path ? reg_path : "(none)"); + 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; - reg->bfs = bfs_create (res_get (res, "register"), reg_path); + } + reg->bfs = bfs_create(res_get(res, "register"), reg_path); if (!reg->bfs) { data1_destroy(reg->dh); + xfree(reg->name); + xfree(reg); return 0; } if (useshadow) - bf_cache (reg->bfs, res_get (res, "shadow")); + { + if (bf_cache(reg->bfs, res_get(res, "shadow")) == ZEBRA_FAIL) + { + bfs_destroy(reg->bfs); + data1_destroy(reg->dh); + xfree(reg->name); + xfree(reg); + return 0; + } + } - getcwd(cwd, sizeof(cwd)-1); - profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); - yaz_log(LOG_DEBUG, "profilePath=%s cwd=%s", profilePath, cwd); + profilePath = res_get_def(res, "profilePath", 0); - data1_set_tabpath (reg->dh, profilePath); - data1_set_tabroot (reg->dh, reg_path); - reg->recTypes = recTypes_init (zs->record_classes, reg->dh); + data1_set_tabpath(reg->dh, profilePath); + 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->key_block = 0; + reg->keys = zebra_rec_keys_open(); - reg->keys.buf_max = 0; - reg->keys.buf = 0; - reg->keys.codec_handle = iscz1_start(); - - reg->sortKeys.buf = 0; - reg->sortKeys.buf_max = 0; + reg->sortKeys = zebra_rec_keys_open(); reg->records = 0; reg->dict = 0; - reg->sortIdx = 0; + reg->sort_index = 0; reg->isams = 0; reg->matchDict = 0; reg->isamc = 0; reg->isamb = 0; reg->zei = 0; - reg->matchDict = 0; - reg->key_file_no = 0; - reg->ptr_i=0; - zebraRankInstall (reg, rank1_class); - zebraRankInstall (reg, rankzv_class); - - recordCompression = res_get_def (res, "recordCompression", "none"); - if (!strcmp (recordCompression, "none")) + /* installing rank classes */ + zebraRankInstall(reg, rank_1_class); + zebraRankInstall(reg, rank_2_class); + zebraRankInstall(reg, rank_similarity_class); + zebraRankInstall(reg, rank_static_class); + + compression_str = res_get_def(res, "recordCompression", "none"); + if (!strcmp(compression_str, "none")) record_compression = REC_COMPRESS_NONE; - if (!strcmp (recordCompression, "bzip2")) + else if (!strcmp(compression_str, "bzip2")) record_compression = REC_COMPRESS_BZIP2; + else if (!strcmp(compression_str, "zlib")) + record_compression = REC_COMPRESS_ZLIB; + else + { + yaz_log(YLOG_FATAL, "invalid recordCompression: %s", compression_str); + ret = ZEBRA_FAIL; + } - if (!(reg->records = rec_open (reg->bfs, rw, record_compression))) + if (!rec_check_compression_method(record_compression)) { - logf (LOG_WARN, "rec_open"); - return 0; + yaz_log(YLOG_FATAL, "unsupported recordCompression: %s", + compression_str); + ret = ZEBRA_FAIL; + } + + { + const char *index_fname = res_get_def(res, "index", "default.idx"); + if (index_fname && *index_fname && strcmp(index_fname, "none")) + { + if (zebra_maps_read_file(reg->zebra_maps, index_fname) != ZEBRA_OK) + ret = ZEBRA_FAIL; + } + else + { + zebra_maps_define_default_sort(reg->zebra_maps); + } + } + + if (!(reg->records = rec_open(reg->bfs, rw, record_compression))) + { + yaz_log(YLOG_WARN, "rec_open failed"); + ret = ZEBRA_FAIL; } if (rw) { - reg->matchDict = dict_open_res (reg->bfs, GMATCH_DICT, 20, 1, 0, res); + reg->matchDict = dict_open_res(reg->bfs, GMATCH_DICT, 20, 1, 0, res); } - if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res))) + if (!(reg->dict = dict_open_res(reg->bfs, FNAME_DICT, 40, rw, 0, res))) { - logf (LOG_WARN, "dict_open"); - return 0; + yaz_log(YLOG_WARN, "dict_open failed"); + ret = ZEBRA_FAIL; } - if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw))) + + + if (res_get_match(res, "sortindex", "f", "f")) + sort_type = ZEBRA_SORT_TYPE_FLAT; + else if (res_get_match(res, "sortindex", "i", "f")) + sort_type = ZEBRA_SORT_TYPE_ISAMB; + else if (res_get_match(res, "sortindex", "m", "f")) + sort_type = ZEBRA_SORT_TYPE_MULTI; + else { - logf (LOG_WARN, "sortIdx_open"); - return 0; + yaz_log(YLOG_WARN, "bad_value for 'sortindex'"); + ret = ZEBRA_FAIL; + } + + + if (!(reg->sort_index = zebra_sort_open(reg->bfs, rw, sort_type))) + { + yaz_log(YLOG_WARN, "zebra_sort_open failed"); + ret = ZEBRA_FAIL; } - if (res_get_match (res, "isam", "s", ISAM_DEFAULT)) + if (res_get_match(res, "isam", "s", ISAM_DEFAULT)) { struct ISAMS_M_s isams_m; - if (!(reg->isams = isams_open (reg->bfs, FNAME_ISAMS, rw, + if (!(reg->isams = isams_open(reg->bfs, FNAME_ISAMS, rw, key_isams_m(res, &isams_m)))) { - logf (LOG_WARN, "isams_open"); - return 0; + yaz_log(YLOG_WARN, "isams_open failed"); + ret = ZEBRA_FAIL; } } - if (res_get_match (res, "isam", "c", ISAM_DEFAULT)) + if (res_get_match(res, "isam", "c", ISAM_DEFAULT)) { struct ISAMC_M_s isamc_m; - if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC, - rw, key_isamc_m(res, &isamc_m)))) + if (!(reg->isamc = isamc_open(reg->bfs, FNAME_ISAMC, + rw, key_isamc_m(res, &isamc_m)))) { - logf (LOG_WARN, "isc_open"); - return 0; + yaz_log(YLOG_WARN, "isamc_open failed"); + ret = ZEBRA_FAIL; } } - if (res_get_match (res, "isam", "b", ISAM_DEFAULT)) + if (res_get_match(res, "isam", "b", ISAM_DEFAULT)) { struct ISAMC_M_s isamc_m; - if (!(reg->isamb = isamb_open (reg->bfs, "isamb", - rw, key_isamc_m(res, &isamc_m), 0))) + if (!(reg->isamb = isamb_open(reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), 0))) { - logf (LOG_WARN, "isamb_open"); - return 0; + yaz_log(YLOG_WARN, "isamb_open failed"); + ret = ZEBRA_FAIL; } } - if (res_get_match (res, "isam", "bc", ISAM_DEFAULT)) + if (res_get_match(res, "isam", "bc", ISAM_DEFAULT)) { struct ISAMC_M_s isamc_m; - if (!(reg->isamb = isamb_open (reg->bfs, "isamb", - rw, key_isamc_m(res, &isamc_m), 1))) + if (!(reg->isamb = isamb_open(reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), 1))) { - logf (LOG_WARN, "isamb_open"); - return 0; + yaz_log(YLOG_WARN, "isamb_open failed"); + ret = ZEBRA_FAIL; } } - if (res_get_match (res, "isam", "null", ISAM_DEFAULT)) + if (res_get_match(res, "isam", "null", ISAM_DEFAULT)) { struct ISAMC_M_s isamc_m; - if (!(reg->isamb = isamb_open (reg->bfs, "isamb", - rw, key_isamc_m(res, &isamc_m), -1))) + if (!(reg->isamb = isamb_open(reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), -1))) { - logf (LOG_WARN, "isamb_open"); - return 0; + yaz_log(YLOG_WARN, "isamb_open failed"); + ret = ZEBRA_FAIL; } } - reg->zei = zebraExplain_open (reg->records, reg->dh, - res, rw, reg, - explain_extract); - if (!reg->zei) + if (ret == ZEBRA_OK) { - logf (LOG_WARN, "Cannot obtain EXPLAIN information"); + reg->zei = zebraExplain_open(reg->records, reg->dh, + res, rw, reg, + zebra_extract_explain); + if (!reg->zei) + { + yaz_log(YLOG_WARN, "Cannot obtain EXPLAIN information"); + ret = ZEBRA_FAIL; + } + } + + if (ret != ZEBRA_OK) + { + zebra_register_close(zs, reg); return 0; } - reg->active = 2; - yaz_log (LOG_DEBUG, "zebra_register_open ok p=%p", reg); + yaz_log(YLOG_DEBUG, "zebra_register_open ok p=%p", reg); return reg; } -int zebra_admin_shutdown (ZebraHandle zh) +ZEBRA_RES zebra_admin_shutdown(ZebraHandle zh) { - ASSERTZH; - yaz_log(LOG_API,"zebra_admin_shutdown"); - zh->errCode=0; + ZEBRA_CHECK_HANDLE(zh); + yaz_log(log_level, "zebra_admin_shutdown"); - zebra_mutex_cond_lock (&zh->service->session_lock); + zebra_mutex_cond_lock(&zh->service->session_lock); zh->service->stop_flag = 1; - zebra_mutex_cond_unlock (&zh->service->session_lock); - return 0; + zebra_mutex_cond_unlock(&zh->service->session_lock); + return ZEBRA_OK; } -int zebra_admin_start (ZebraHandle zh) +ZEBRA_RES zebra_admin_start(ZebraHandle zh) { ZebraService zs; - ASSERTZH; - yaz_log(LOG_API,"zebra_admin_start"); - zh->errCode=0; + ZEBRA_CHECK_HANDLE(zh); + yaz_log(log_level, "zebra_admin_start"); zs = zh->service; - zebra_mutex_cond_lock (&zs->session_lock); - zebra_mutex_cond_unlock (&zs->session_lock); - return 0; + 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(LOG_DEBUG, "zebra_register_close p=%p", 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) - isc_close (reg->isamc); - if (reg->isamb) - isamb_close (reg->isamb); - rec_close (®->records); - } - - recTypes_destroy (reg->recTypes); - zebra_maps_close (reg->zebra_maps); - zebraRankDestroy (reg); - bfs_destroy (reg->bfs); - data1_destroy (reg->dh); - - xfree (reg->sortKeys.buf); - xfree (reg->keys.buf); - if (reg->keys.codec_handle) - iscz1_stop(reg->keys.codec_handle); - xfree (reg->key_buf); - xfree (reg->name); - xfree (reg); -} - -int zebra_stop(ZebraService zs) + zebra_chdir(zs); + + zebraExplain_close(reg->zei); + dict_close(reg->dict); + if (reg->matchDict) + dict_close(reg->matchDict); + zebra_sort_close(reg->sort_index); + 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); + zebraRankDestroy(reg); + bfs_destroy(reg->bfs); + data1_destroy(reg->dh); + + zebra_rec_keys_close(reg->keys); + zebra_rec_keys_close(reg->sortKeys); + + key_block_destroy(®->key_block); + xfree(reg->name); + xfree(reg); +} + +ZEBRA_RES zebra_stop(ZebraService zs) { if (!zs) - return 0; - yaz_log (LOG_API, "zebra_stop"); - + return ZEBRA_OK; while (zs->sessions) { - zebra_close (zs->sessions); + zebra_close(zs->sessions); } - zebra_mutex_cond_destroy (&zs->session_lock); + zebra_mutex_cond_destroy(&zs->session_lock); if (zs->passwd_db) - passwd_db_close (zs->passwd_db); + passwd_db_close(zs->passwd_db); recTypeClass_destroy(zs->record_classes); nmem_destroy(zs->nmem); - res_close (zs->global_res); - xfree (zs->configName); - xfree (zs); - return 0; + res_close(zs->global_res); + + yaz_timing_stop(zs->timing); + yaz_log(YLOG_LOG, "zebra_stop: %4.2f %4.2f %4.2f", + yaz_timing_get_real(zs->timing), + yaz_timing_get_user(zs->timing), + yaz_timing_get_sys(zs->timing)); + + + yaz_timing_destroy(&zs->timing); + xfree(zs); + return ZEBRA_OK; } -int zebra_close (ZebraHandle zh) +ZEBRA_RES zebra_close(ZebraHandle zh) { ZebraService zs; struct zebra_session **sp; int i; - yaz_log(LOG_API,"zebra_close"); - if (!zh) - return 0; - ASSERTZH; - zh->errCode=0; + yaz_log(log_level, "zebra_close"); + ZEBRA_CHECK_HANDLE(zh); + + zh->errCode = 0; zs = zh->service; - yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh); - resultSetDestroy (zh, -1, 0, 0); + yaz_log(YLOG_DEBUG, "zebra_close zh=%p", zh); + resultSetDestroy(zh, -1, 0, 0); if (zh->reg) - zebra_register_close (zh->service, zh->reg); - zebra_close_res (zh); + zebra_register_close(zh->service, zh->reg); + zebra_close_res(zh); + res_close(zh->session_res); + + xfree(zh->record_encoding); - xfree (zh->record_encoding); + xfree(zh->dbaccesslist); for (i = 0; i < zh->num_basenames; i++) - xfree (zh->basenames[i]); - xfree (zh->basenames); + xfree(zh->basenames[i]); + xfree(zh->basenames); if (zh->iconv_to_utf8 != 0) - yaz_iconv_close (zh->iconv_to_utf8); + yaz_iconv_close(zh->iconv_to_utf8); if (zh->iconv_from_utf8 != 0) - yaz_iconv_close (zh->iconv_from_utf8); + yaz_iconv_close(zh->iconv_from_utf8); - zebra_mutex_cond_lock (&zs->session_lock); - zebra_lock_destroy (zh->lock_normal); - zebra_lock_destroy (zh->lock_shadow); + zebra_mutex_cond_lock(&zs->session_lock); + zebra_lock_destroy(zh->lock_normal); + zebra_lock_destroy(zh->lock_shadow); sp = &zs->sessions; while (1) { - assert (*sp); + assert(*sp); if (*sp == zh) { *sp = (*sp)->next; @@ -516,13 +698,18 @@ int zebra_close (ZebraHandle zh) } sp = &(*sp)->next; } - zebra_mutex_cond_unlock (&zs->session_lock); - xfree (zh->reg_name); - xfree (zh->user_perm); - zh->service=0; /* more likely to trigger an assert */ - xfree (zh->path_reg); - xfree (zh); - return 0; + zebra_mutex_cond_unlock(&zs->session_lock); + xfree(zh->reg_name); + xfree(zh->user_perm); + zh->service = 0; /* more likely to trigger an assert */ + + zebra_limit_destroy(zh->m_limit); + + nmem_destroy(zh->nmem_error); + + xfree(zh->path_reg); + xfree(zh); + return ZEBRA_OK; } struct map_baseinfo { @@ -535,108 +722,137 @@ struct map_baseinfo { int new_num_max; }; -static Res zebra_open_res (ZebraHandle zh) +static void zebra_open_res(ZebraHandle zh) { - Res res = 0; char fname[512]; ASSERTZH; - zh->errCode=0; + zh->errCode = 0; if (zh->path_reg) { - sprintf (fname, "%.200s/zebra.cfg", zh->path_reg); - res = res_open (fname, zh->service->global_res, 0); - if (!res) - res = zh->service->global_res; + sprintf(fname, "%.200s/zebra.cfg", zh->path_reg); + zh->res = res_open(zh->session_res, 0); + res_read_file(zh->res, fname); } else if (*zh->reg_name == 0) { - res = zh->service->global_res; + zh->res = res_open(zh->session_res, 0); } else { - yaz_log (LOG_WARN, "no register root specified"); - return 0; /* no path for register - fail! */ + yaz_log(YLOG_WARN, "no register root specified"); + zh->res = 0; /* no path for register - fail! */ } - return res; } -static void zebra_close_res (ZebraHandle zh) +static void zebra_close_res(ZebraHandle zh) { ASSERTZH; - zh->errCode=0; - if (zh->res != zh->service->global_res) - res_close (zh->res); + zh->errCode = 0; + res_close(zh->res); zh->res = 0; } -static int zebra_select_register (ZebraHandle zh, const char *new_reg) +static void zebra_select_register(ZebraHandle zh, const char *new_reg) { ASSERTZH; - zh->errCode=0; - if (zh->res && strcmp (zh->reg_name, new_reg) == 0) - return 0; + zh->errCode = 0; + if (zh->res && strcmp(zh->reg_name, new_reg) == 0) + return; if (!zh->res) { - assert (zh->reg == 0); - assert (*zh->reg_name == 0); + assert(zh->reg == 0); + assert(*zh->reg_name == 0); } else { if (zh->reg) { - resultSetInvalidate (zh); - zebra_register_close (zh->service, zh->reg); + resultSetInvalidate(zh); + zebra_register_close(zh->service, zh->reg); zh->reg = 0; } zebra_close_res(zh); } - xfree (zh->reg_name); - zh->reg_name = xstrdup (new_reg); + xfree(zh->reg_name); + zh->reg_name = xstrdup(new_reg); - xfree (zh->path_reg); + xfree(zh->path_reg); zh->path_reg = 0; if (zh->service->path_root) { - zh->path_reg = xmalloc (strlen(zh->service->path_root) + - strlen(zh->reg_name) + 3); - strcpy (zh->path_reg, zh->service->path_root); + zh->path_reg = xmalloc(strlen(zh->service->path_root) + + strlen(zh->reg_name) + 3); + strcpy(zh->path_reg, zh->service->path_root); if (*zh->reg_name) { - strcat (zh->path_reg, "/"); - strcat (zh->path_reg, zh->reg_name); + strcat(zh->path_reg, "/"); + strcat(zh->path_reg, zh->reg_name); } } - zh->res = zebra_open_res (zh); + zebra_open_res(zh); if (zh->lock_normal) - zebra_lock_destroy (zh->lock_normal); + zebra_lock_destroy(zh->lock_normal); zh->lock_normal = 0; if (zh->lock_shadow) - zebra_lock_destroy (zh->lock_shadow); + zebra_lock_destroy(zh->lock_shadow); zh->lock_shadow = 0; if (zh->res) { char fname[512]; - const char *lock_area =res_get (zh->res, "lockDir"); + const char *lock_area = res_get(zh->res, "lockDir"); if (!lock_area && zh->path_reg) - res_set (zh->res, "lockDir", zh->path_reg); - sprintf (fname, "norm.%s.LCK", zh->reg_name); + 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); + 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 (zh->lock_normal) + { + zebra_lock_destroy(zh->lock_normal); + zh->lock_normal = 0; + } + if (zh->lock_shadow) + { + zebra_lock_destroy(zh->lock_shadow); + zh->lock_shadow = 0; + } + zebra_close_res(zh); + } + } + if (zh->res) + { + int approx = 0; + if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK) + zebra_set_approx_limit(zh, approx); + } + if (zh->res) + { + 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); + } + if (zh->res) + { + if (res_get_int(zh->res, "segment", &zh->m_segment_indexing) == + ZEBRA_OK) + { + yaz_log(YLOG_DEBUG, "segment indexing set and is %d", + zh->m_segment_indexing); + } } - return 1; } -void map_basenames_func (void *vp, const char *name, const char *value) +void map_basenames_func(void *vp, const char *name, const char *value) { struct map_baseinfo *p = (struct map_baseinfo *) vp; int i, no; @@ -647,14 +863,14 @@ void map_basenames_func (void *vp, const char *name, const char *value) assert(vp); no = - sscanf (value, "%127s %127s %127s %127s %127s %127s %127s %127s %127s", - fromdb, todb[0], todb[1], todb[2], todb[3], todb[4], - todb[5], todb[6], todb[7]); + sscanf(value, "%127s %127s %127s %127s %127s %127s %127s %127s %127s", + fromdb, todb[0], todb[1], todb[2], todb[3], todb[4], + todb[5], todb[6], todb[7]); if (no < 2) return ; no--; for (i = 0; inum_bases; i++) - if (p->basenames[i] && !STRCASECMP (p->basenames[i], fromdb)) + if (p->basenames[i] && !STRCASECMP(p->basenames[i], fromdb)) { p->basenames[i] = 0; for (i = 0; i < no; i++) @@ -662,110 +878,151 @@ void map_basenames_func (void *vp, const char *name, const char *value) if (p->new_num_bases == p->new_num_max) return; p->new_basenames[(p->new_num_bases)++] = - nmem_strdup (p->mem, todb[i]); + nmem_strdup(p->mem, todb[i]); } return; } } -void map_basenames (ZebraHandle zh, ODR stream, - int *num_bases, char ***basenames) +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->session_res, "group"); + const char *v = res_get_prefix(zh->session_res, + "database", group, "Default"); + return zebra_select_database(zh, v); + } + return 0; +} + +void map_basenames(ZebraHandle zh, ODR stream, + int *num_bases, char ***basenames) { struct map_baseinfo info; struct map_baseinfo *p = &info; int i; ASSERTZH; - yaz_log(LOG_API,"map_basenames "); + yaz_log(log_level, "map_basenames "); assert(stream); - zh->errCode=0; - info.zh = zh; + info.num_bases = *num_bases; info.basenames = *basenames; info.new_num_max = 128; info.new_num_bases = 0; info.new_basenames = (char **) - odr_malloc (stream, sizeof(*info.new_basenames) * info.new_num_max); + odr_malloc(stream, sizeof(*info.new_basenames) * info.new_num_max); info.mem = stream->mem; - res_trav (zh->service->global_res, "mapdb", &info, map_basenames_func); + res_trav(zh->session_res, "mapdb", &info, map_basenames_func); for (i = 0; inum_bases; i++) if (p->basenames[i] && p->new_num_bases < p->new_num_max) { p->new_basenames[(p->new_num_bases)++] = - nmem_strdup (p->mem, p->basenames[i]); + nmem_strdup(p->mem, p->basenames[i]); } *num_bases = info.new_num_bases; *basenames = info.new_basenames; for (i = 0; i<*num_bases; i++) - logf (LOG_DEBUG, "base %s", (*basenames)[i]); + yaz_log(YLOG_DEBUG, "base %s", (*basenames)[i]); } -int zebra_select_database (ZebraHandle zh, const char *basename) +ZEBRA_RES zebra_select_database(ZebraHandle zh, const char *basename) { - ASSERTZH; - yaz_log(LOG_API,"zebra_select_database %s",basename); + ZEBRA_CHECK_HANDLE(zh); + + yaz_log(log_level, "zebra_select_database %s",basename); assert(basename); - zh->errCode=0; - return zebra_select_databases (zh, 1, &basename); + return zebra_select_databases(zh, 1, &basename); } -int zebra_select_databases (ZebraHandle zh, int num_bases, - const char **basenames) +ZEBRA_RES zebra_select_databases(ZebraHandle zh, int num_bases, + const char **basenames) { int i; const char *cp; int len = 0; char *new_reg = 0; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); assert(basenames); - yaz_log(LOG_API,"zebra_select_databases n=%d [0]=%s", - num_bases,basenames[0]); - zh->errCode=0; + yaz_log(log_level, "zebra_select_databases n=%d [0]=%s", + num_bases,basenames[0]); + zh->errCode = 0; if (num_bases < 1) { - zh->errCode = 23; - return -1; + zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; + return ZEBRA_FAIL; + } + + /* Check if the user has access to all databases (Seb) */ + /* You could argue that this should happen later, after we have + * determined that the database(s) exist. */ + if (zh->dbaccesslist) { + for (i = 0; i < num_bases; i++) { + const char *db = basenames[i]; + char *p, *pp; + for (p = zh->dbaccesslist; p && *p; p = pp) { + int len; + if ((pp = strchr(p, '+'))) { + len = pp - p; + pp++; + } + else + len = strlen(p); + if (len == strlen(db) && !strncmp(db, p, len)) + break; + } + if (!p) { + zh->errCode = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED; + return ZEBRA_FAIL; + } + } } + for (i = 0; i < zh->num_basenames; i++) - xfree (zh->basenames[i]); - xfree (zh->basenames); + xfree(zh->basenames[i]); + xfree(zh->basenames); zh->num_basenames = num_bases; - zh->basenames = xmalloc (zh->num_basenames * sizeof(*zh->basenames)); + zh->basenames = xmalloc(zh->num_basenames * sizeof(*zh->basenames)); for (i = 0; i < zh->num_basenames; i++) - zh->basenames[i] = xstrdup (basenames[i]); + zh->basenames[i] = xstrdup(basenames[i]); cp = strrchr(basenames[0], '/'); if (cp) { len = cp - basenames[0]; - new_reg = xmalloc (len + 1); - memcpy (new_reg, basenames[0], len); + new_reg = xmalloc(len + 1); + memcpy(new_reg, basenames[0], len); new_reg[len] = '\0'; } else - new_reg = xstrdup (""); + new_reg = xstrdup(""); for (i = 1; ierrCode = 23; + zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; return -1; } if (len != cp1 - basenames[i] || - memcmp (basenames[i], new_reg, len)) + memcmp(basenames[i], new_reg, len)) { - zh->errCode = 23; + zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; return -1; } } @@ -773,218 +1030,306 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, { if (cp1) { - zh->errCode = 23; - return -1; + zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; + return ZEBRA_FAIL; } } } - zebra_select_register (zh, new_reg); - xfree (new_reg); + zebra_select_register(zh, new_reg); + xfree(new_reg); if (!zh->res) { - zh->errCode = 109; - return -1; + zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; + return ZEBRA_FAIL; } if (!zh->lock_normal || !zh->lock_shadow) { - zh->errCode = 2; - return -1; + zh->errCode = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + return ZEBRA_FAIL; } - return 0; + return ZEBRA_OK; } -int zebra_search_RPN (ZebraHandle zh, ODR o, - Z_RPNQuery *query, const char *setname, int *hits) +ZEBRA_RES zebra_set_approx_limit(ZebraHandle zh, zint approx_limit) { - const char *max; - zint maxhits; - ASSERTZH; + if (approx_limit == 0) + approx_limit = DEFAULT_APPROX_LIMIT; + zh->approx_limit = approx_limit; + return ZEBRA_OK; +} + +void zebra_set_partial_result(ZebraHandle zh) +{ + zh->partial_result = 1; +} + + +ZEBRA_RES zebra_set_break_handler(ZebraHandle zh, + int (*f)(void *client_data), + void *client_data) +{ + zh->break_handler_func = f; + zh->break_handler_data = client_data; + return ZEBRA_OK; +} + +ZEBRA_RES zebra_search_RPN_x(ZebraHandle zh, ODR o, Z_RPNQuery *query, + const char *setname, zint *hits, + int *estimated_hit_count, + int *partial_resultset) +{ + ZEBRA_RES r; + + ZEBRA_CHECK_HANDLE(zh); + assert(o); assert(query); assert(hits); assert(setname); - yaz_log(LOG_API,"zebra_search_rpn"); - zh->errCode=0; - zh->hits = 0; - *hits = 0; - - if (zebra_begin_read (zh)) - return 1; - - resultSetAddRPN (zh, odr_extract_mem(o), query, - zh->num_basenames, zh->basenames, setname); - - zebra_end_read (zh); - max = res_get (zh->res, "maxhits"); - if (max) - maxhits=atoi(max); - else { - int i=0; - maxhits=INT_MAX; /* properly rounded, to make it look like a limit*/ - while (maxhits>100) { maxhits/=10; i++;} - while (i--) maxhits *= 10; - } - if (zh->hits > maxhits) { /* too large for yaz to handle */ - logf(LOG_DEBUG,"limiting hits to "ZINT_FORMAT, maxhits); - *hits=maxhits; - } - else - *hits = zh->hits; - return 0; + yaz_log(log_level, "zebra_search_rpn"); + + zh->partial_result = 0; + + if (zebra_begin_read(zh) == ZEBRA_FAIL) + return ZEBRA_FAIL; + + r = resultSetAddRPN(zh, odr_extract_mem(o), query, + zh->num_basenames, zh->basenames, setname, + hits, estimated_hit_count); + + *partial_resultset = zh->partial_result; + zebra_end_read(zh); + return r; } -int zebra_records_retrieve (ZebraHandle zh, ODR stream, - const char *setname, Z_RecordComposition *comp, - oid_value input_format, int num_recs, - ZebraRetrievalRecord *recs) +ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, + const char *setname, zint *hits) { - ZebraPosSet poset; - int i, *pos_array, ret = 0; - ASSERTZH; + int estimated_hit_count; + int partial_resultset; + return zebra_search_RPN_x(zh, o, query, setname, hits, + &estimated_hit_count, + &partial_resultset); +} + +ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, + const char *setname, + Z_RecordComposition *comp, + const Odr_oid *input_format, int num_recs, + ZebraRetrievalRecord *recs) +{ + ZebraMetaRecord *poset; + int i; + ZEBRA_RES ret = ZEBRA_OK; + zint *pos_array; + + ZEBRA_CHECK_HANDLE(zh); assert(stream); assert(setname); assert(recs); assert(num_recs>0); - yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs); - zh->errCode=0; + yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs); if (!zh->res) { - zh->errCode = 30; - zh->errString = odr_strdup (stream, setname); - return -1; + zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, + setname); + return ZEBRA_FAIL; } - zh->errCode = 0; - - if (zebra_begin_read (zh)) - return -1; + if (zebra_begin_read(zh) == ZEBRA_FAIL) + return ZEBRA_FAIL; - pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); + pos_array = (zint *) xmalloc(num_recs * sizeof(*pos_array)); for (i = 0; ierrCode = 30; - zh->errString = nmem_strdup (stream->mem, setname); - ret = -1; + yaz_log(YLOG_DEBUG, "zebraPosSetCreate error"); + zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, + setname); + ret = ZEBRA_FAIL; } else { - for (i = 0; i 0) + { + recs[i].buf = (char*) odr_malloc(stream, len); + memcpy(recs[i].buf, buf, len); + } + else + recs[i].buf = buf; + recs[i].score = poset[i].score; + zebra_snippets_destroy(hit_snippet); } else { - char num_str[20]; - - sprintf (num_str, "%d", pos_array[i]); - zh->errCode = 13; - zh->errString = odr_strdup (stream, num_str); - ret = -1; - break; + /* only need to set it once */ + if (pos_array[i] < zh->approx_limit && ret == ZEBRA_OK) + { + zebra_setError_zint(zh, + YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, + pos_array[i]); + ret = ZEBRA_FAIL; + break; + } } } - zebraPosSetDestroy (zh, poset, num_recs); + zebra_meta_records_destroy(zh, poset, num_recs); + wrbuf_destroy(addinfo_w); } - zebra_end_read (zh); - xfree (pos_array); + zebra_end_read(zh); + xfree(pos_array); return ret; } -int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, - int *position, int *num_entries, ZebraScanEntry **entries, - int *is_partial) +ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query, + int *position, + int *num_entries, ZebraScanEntry **entries, + int *is_partial, + const char *setname) { - ASSERTZH; + YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); + Z_AttributesPlusTerm *zapt; + Odr_oid *attributeSet; + ZEBRA_RES res; + + if (!(zapt = yaz_pqf_scan(pqf_parser, stream, &attributeSet, query))) + { + res = ZEBRA_FAIL; + zh->errCode = YAZ_BIB1_SCAN_MALFORMED_SCAN; + } + else + { + res = zebra_scan(zh, stream, zapt, yaz_oid_attset_bib_1, + position, num_entries, entries, is_partial, + setname); + } + yaz_pqf_destroy(pqf_parser); + return res; +} + +ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, + const Odr_oid *attributeset, + int *position, + int *num_entries, ZebraScanEntry **entries, + int *is_partial, + const char *setname) +{ + ZEBRA_RES res; + + ZEBRA_CHECK_HANDLE(zh); + assert(stream); assert(zapt); assert(position); assert(num_entries); assert(is_partial); assert(entries); - yaz_log(LOG_API,"zebra_scan"); - zh->errCode=0; - if (zebra_begin_read (zh)) + yaz_log(log_level, "zebra_scan"); + + if (zebra_begin_read(zh) == ZEBRA_FAIL) { *entries = 0; *num_entries = 0; - return 1; + return ZEBRA_FAIL; } - rpn_scan (zh, stream, zapt, attributeset, - zh->num_basenames, zh->basenames, position, - num_entries, entries, is_partial, 0, 0); - zebra_end_read (zh); - return 0; + + res = rpn_scan(zh, stream, zapt, attributeset, + zh->num_basenames, zh->basenames, position, + num_entries, entries, is_partial, setname); + zebra_end_read(zh); + return res; } -int zebra_sort (ZebraHandle zh, ODR stream, - int num_input_setnames, const char **input_setnames, - const char *output_setname, Z_SortKeySpecList *sort_sequence, - int *sort_status) +ZEBRA_RES zebra_sort(ZebraHandle zh, ODR stream, + int num_input_setnames, const char **input_setnames, + const char *output_setname, + Z_SortKeySpecList *sort_sequence, + int *sort_status) { - ASSERTZH; + ZEBRA_RES res; + ZEBRA_CHECK_HANDLE(zh); assert(stream); assert(num_input_setnames>0); assert(input_setnames); assert(sort_sequence); assert(sort_status); - yaz_log(LOG_API,"zebra_sort"); - zh->errCode=0; - if (zebra_begin_read (zh)) - return 1; - resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, - output_setname, sort_sequence, sort_status); + yaz_log(log_level, "zebra_sort"); + + if (zebra_begin_read(zh) == ZEBRA_FAIL) + return ZEBRA_FAIL; + res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames, + output_setname, sort_sequence, sort_status); zebra_end_read(zh); - return 0; + return res; } -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_API,"zebra_deleleResultSet n=%d",num_setnames); - zh->errCode=0; + yaz_log(log_level, "zebra_deleteResultSet n=%d", num_setnames); + if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; switch (function) { case Z_DeleteResultSetRequest_list: - resultSetDestroy (zh, num_setnames, setnames, statuses); + assert(num_setnames>0); + assert(setnames); + resultSetDestroy(zh, num_setnames, setnames, statuses); break; case Z_DeleteResultSetRequest_all: - resultSetDestroy (zh, -1, 0, statuses); + resultSetDestroy(zh, -1, 0, statuses); break; } - zebra_end_read (zh); + zebra_end_read(zh); status = Z_DeleteStatus_success; for (i = 0; ierrCode); + yaz_log(log_level, "zebra_errCode: %d",zh->errCode); return zh->errCode; } - yaz_log(LOG_API,"zebra_errCode: o"); + yaz_log(log_level, "zebra_errCode: o"); return 0; } -const char *zebra_errString (ZebraHandle zh) +const char *zebra_errString(ZebraHandle zh) { - const char *e=""; + const char *e = 0; if (zh) - e= diagbib1_str (zh->errCode); - yaz_log(LOG_API,"zebra_errString: %s",e); + e= diagbib1_str(zh->errCode); + yaz_log(log_level, "zebra_errString: %s",e); return e; } -char *zebra_errAdd (ZebraHandle zh) +char *zebra_errAdd(ZebraHandle zh) { - char *a=""; + char *a = 0; if (zh) a= zh->errString; - yaz_log(LOG_API,"zebra_errAdd: %s",a); + yaz_log(log_level, "zebra_errAdd: %s",a); return a; } -void zebra_clearError(ZebraHandle zh) -{ - if (zh) - { - zh->errCode=0; - zh->errString=""; - } -} - -int zebra_auth (ZebraHandle zh, const char *user, const char *pass) +ZEBRA_RES zebra_auth(ZebraHandle zh, const char *user, const char *pass) { const char *p; + const char *astring; char u[40]; ZebraService zs; - ASSERTZH; - zh->errCode=0; - zs= zh->service; + ZEBRA_CHECK_HANDLE(zh); + + zs = zh->service; sprintf(u, "perm.%.30s", user ? user : "anonymous"); p = res_get(zs->global_res, u); - xfree (zh->user_perm); + xfree(zh->user_perm); zh->user_perm = xstrdup(p ? p : "r"); + /* Determine database access list */ + astring = res_get(zs->dbaccess, user ? user : "anonymous"); + if (astring) + zh->dbaccesslist = xstrdup(astring); + else + zh->dbaccesslist = 0; + /* users that don't require a password .. */ if (zh->user_perm && strchr(zh->user_perm, 'a')) - return 0; + return ZEBRA_OK; - if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass)) - return 0; - return 1; + if (!zs->passwd_db || !passwd_db_auth(zs->passwd_db, user, pass)) + return ZEBRA_OK; + return ZEBRA_FAIL; } -int zebra_admin_import_begin (ZebraHandle zh, const char *database, - const char *record_type) +ZEBRA_RES zebra_admin_import_begin(ZebraHandle zh, const char *database, + const char *record_type) { - ASSERTZH; - yaz_log(LOG_API,"zebra_admin_import_begin db=%s rt=%s", - database, record_type); - zh->errCode=0; - if (zebra_select_database(zh, database)) - return 1; - if (zebra_begin_trans (zh, 1)) - return 1; - return 0; + yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", + database, record_type); + if (zebra_select_database(zh, database) == ZEBRA_FAIL) + return ZEBRA_FAIL; + return zebra_begin_trans(zh, 1); } -int zebra_admin_import_end (ZebraHandle zh) +ZEBRA_RES zebra_admin_import_end(ZebraHandle zh) { - ASSERTZH; - yaz_log(LOG_API,"zebra_admin_import_end"); - zh->errCode=0; - zebra_end_trans (zh); - return 0; + ZEBRA_CHECK_HANDLE(zh); + yaz_log(log_level, "zebra_admin_import_end"); + return zebra_end_trans(zh); } -int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) +ZEBRA_RES zebra_admin_import_segment(ZebraHandle zh, Z_Segment *segment) { - SYSNO sysno; + ZEBRA_RES res = ZEBRA_OK; + zint sysno; int i; - ASSERTZH; - yaz_log(LOG_API,"zebra_admin_import_segment"); - zh->errCode=0; + ZEBRA_CHECK_HANDLE(zh); + yaz_log(log_level, "zebra_admin_import_segment"); + for (i = 0; inum_segmentRecords; i++) { Z_NamePlusRecord *npr = segment->segmentRecords[i]; - printf ("--------------%d--------------------\n", i); - /* FIXME - What! printing on stdout ??? */ if (npr->which == Z_NamePlusRecord_intermediateFragment) { Z_FragmentSyntax *fragment = npr->u.intermediateFragment; if (fragment->which == Z_FragmentSyntax_notExternallyTagged) { Odr_oct *oct = fragment->u.notExternallyTagged; - printf ("%.*s", (oct->len > 100 ? 100 : oct->len) , - oct->buf); - sysno = 0; - zebra_update_record(zh, - 0, /* record Type */ - &sysno, - 0, /* match */ - 0, /* fname */ - oct->buf, oct->len, - 0); + if(zebra_update_record( + zh, + action_update, + 0, /* record Type */ + &sysno, + 0, /* match */ + 0, /* fname */ + (const char *) oct->buf, oct->len) == ZEBRA_FAIL) + res = ZEBRA_FAIL; } } } - return 0; + return res; } -int 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 */ - /* 4 = update. Insert/replace */ +int delete_w_handle(const char *info, void *handle) { - SYSNO sysno = 0; - char *rinfo = 0; - char recid_z[256]; - ASSERTZH; - assert(action>0 && action <=4); - assert(rec_buf); - - yaz_log(LOG_API,"zebra_admin_exchange_record ac=%d", action); - zh->errCode=0; - - if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) - return -1; - memcpy (recid_z, recid_buf, recid_len); - recid_z[recid_len] = 0; - - if (zebra_begin_trans(zh, 1)) - return -1; - - rinfo = dict_lookup (zh->reg->matchDict, recid_z); - if (rinfo) - { - if (action == 1) /* fail if insert */ - { - zebra_end_trans(zh); - return -1; - } + ZebraHandle zh = (ZebraHandle) handle; + ISAM_P pos; - memcpy (&sysno, rinfo+1, sizeof(sysno)); - } - else - { - if (action == 2 || action == 3) /* fail if delete or update */ - { - zebra_end_trans(zh); - return -1; - } - action = 1; /* make it an insert (if it's an update).. */ - } - buffer_extract_record (zh, rec_buf, rec_len, - action == 3 ? 1 : 0 /* delete flag */, - 0, /* test mode */ - 0, /* recordType */ - &sysno, - 0, /* match */ - 0, /* fname */ - 0, /* force update */ - 1 /* allow update */ - ); - if (action == 1) - { - dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno); - } - else if (action == 3) + if (*info == sizeof(pos)) { - dict_delete (zh->reg->matchDict, recid_z); + memcpy(&pos, info+1, sizeof(pos)); + isamb_unlink(zh->reg->isamb, pos); } - zebra_end_trans(zh); return 0; } -int delete_w_handle(const char *info, void *handle) +int delete_w_all_handle(const char *info, void *handle) { ZebraHandle zh = (ZebraHandle) handle; - ISAMC_P pos; - ASSERTZH; + ISAM_P pos; if (*info == sizeof(pos)) { - memcpy (&pos, info+1, sizeof(pos)); - isamb_unlink(zh->reg->isamb, pos); + ISAMB_PP pt; + memcpy(&pos, info+1, sizeof(pos)); + pt = isamb_pp_open(zh->reg->isamb, pos, 2); + if (pt) + { + struct it_key key; + key.mem[0] = 0; + while (isamb_pp_read(pt, &key)) + { + Record rec; + rec = rec_get(zh->reg->records, key.mem[0]); + rec_del(zh->reg->records, &rec); + } + isamb_pp_close(pt); + } } - return 0; + return delete_w_handle(info, handle); } -static int delete_SU_handle(void *handle, int ord) +static int delete_SU_handle(void *handle, int ord, + const char *index_type, const char *string_index, + zinfo_index_category_t cat) { ZebraHandle zh = (ZebraHandle) handle; char ord_buf[20]; int ord_len; - - ord_len = key_SU_encode (ord, ord_buf); +#if 0 + yaz_log(YLOG_LOG, "ord=%d index_type=%s index=%s cat=%d", ord, + index_type, string_index, (int) cat); +#endif + ord_len = key_SU_encode(ord, ord_buf); ord_buf[ord_len] = '\0'; - assert (zh->reg->isamb); + assert(zh->reg->isamb); + assert(zh->reg->records); dict_delete_subtree(zh->reg->dict, ord_buf, - zh, delete_w_handle); + zh, + !strcmp(string_index, "_ALLRECORDS") ? + delete_w_all_handle : delete_w_handle); return 0; } -int zebra_drop_database (ZebraHandle zh, const char *database) +ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) { - int ret = 0; - ASSERTZH; - yaz_log(LOG_API,"zebra_drop_database"); - zh->errCode = 0; + ZEBRA_RES ret = ZEBRA_OK; - if (zebra_select_database (zh, database)) - return -1; - if (zebra_begin_trans (zh, 1)) - return -1; + yaz_log(log_level, "zebra_drop_database %s", db); + ZEBRA_CHECK_HANDLE(zh); + + if (zebra_select_database(zh, db) == ZEBRA_FAIL) + return ZEBRA_FAIL; + if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) + return ZEBRA_FAIL; if (zh->reg->isamb) { - zebraExplain_curDatabase (zh->reg->zei, database); - - zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle); - zebraExplain_removeDatabase(zh->reg->zei, zh); + int db_ord; + if (zebraExplain_curDatabase(zh->reg->zei, db)) + { + zebra_setError(zh, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, db); + ret = ZEBRA_FAIL; + } + else + { + 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); + zebra_remove_file_match(zh); + } } else { - yaz_log(LOG_WARN, "drop database only supported for isam:b"); - ret = -1; + yaz_log(YLOG_WARN, "drop database only supported for isam:b"); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "drop database only supported for isam:b"); + ret = ZEBRA_FAIL; + } + if (zebra_end_trans(zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + ret = ZEBRA_FAIL; } - zebra_end_trans (zh); return ret; } -int zebra_create_database (ZebraHandle zh, const char *database) +ZEBRA_RES zebra_create_database(ZebraHandle zh, const char *db) { - ASSERTZH; - yaz_log(LOG_API,"zebra_create_database %s",database); - assert(database); - zh->errCode=0; + yaz_log(log_level, "zebra_create_database %s", db); + ZEBRA_CHECK_HANDLE(zh); + assert(db); - if (zebra_select_database (zh, database)) - return -1; - if (zebra_begin_trans (zh, 1)) - return -1; + if (zebra_select_database(zh, db) == ZEBRA_FAIL) + return ZEBRA_FAIL; + if (zebra_begin_trans(zh, 1)) + return ZEBRA_FAIL; /* announce database */ - if (zebraExplain_newDatabase (zh->reg->zei, database, 0 - /* explainDatabase */)) + if (zebraExplain_newDatabase(zh->reg->zei, db, 0 + /* explainDatabase */)) { - zebra_end_trans (zh); - zh->errCode = 224; - zh->errString = "database already exist"; - return -1; + 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_end_trans (zh); - return 0; + return zebra_end_trans(zh); } -int zebra_string_norm (ZebraHandle zh, unsigned reg_id, - const char *input_str, int input_len, - char *output_str, int output_len) +int zebra_string_norm(ZebraHandle zh, const char *index_type, + const char *input_str, int input_len, + char *output_str, int output_len) { WRBUF wrbuf; + zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type); ASSERTZH; assert(input_str); assert(output_str); - yaz_log(LOG_API,"zebra_string_norm "); - zh->errCode=0; + yaz_log(log_level, "zebra_string_norm "); + if (!zh->reg->zebra_maps) return -1; - wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "", - input_str, input_len); + wrbuf = zebra_replace(zm, "", input_str, input_len); if (!wrbuf) return -2; if (wrbuf_len(wrbuf) >= output_len) return -3; if (wrbuf_len(wrbuf)) - memcpy (output_str, wrbuf_buf(wrbuf), wrbuf_len(wrbuf)); + memcpy(output_str, wrbuf_buf(wrbuf), wrbuf_len(wrbuf)); output_str[wrbuf_len(wrbuf)] = '\0'; return wrbuf_len(wrbuf); } - -int zebra_set_state (ZebraHandle zh, int val, int seqno) - /* FIXME - zint seqno ?? */ +/** \brief set register state (state*.LCK) + \param zh Zebra handle + \param val state + \param seqno sequence number + + val is one of: + d=writing to shadow(shadow enabled); writing to register (shadow disabled) + o=reading only + c=commit (writing to register, reading from shadow, shadow mode only) +*/ +static void zebra_set_state(ZebraHandle zh, int val, int seqno) { char state_fname[256]; char *fname; long p = getpid(); FILE *f; ASSERTZH; - yaz_log(LOG_API,"zebra_set_state v=%d seq=%d", val, seqno); - zh->errCode=0; + yaz_log(log_level, "zebra_set_state v=%c seq=%d", val, seqno); - sprintf (state_fname, "state.%s.LCK", zh->reg_name); - fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); - f = fopen (fname, "w"); - - yaz_log (LOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p); - fprintf (f, "%c %d %ld\n", val, seqno, p); - fclose (f); - xfree (fname); - return 0; + sprintf(state_fname, "state.%s.LCK", zh->reg_name); + fname = zebra_mk_fname(res_get(zh->res, "lockDir"), state_fname); + f = fopen(fname, "w"); + if (!f) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "open %s w", state_fname); + exit(1); + } + yaz_log(YLOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p); + fprintf(f, "%c %d %ld\n", val, seqno, p); + fclose(f); + xfree(fname); } -int zebra_get_state (ZebraHandle zh, char *val, int *seqno) +static void zebra_get_state(ZebraHandle zh, char *val, int *seqno) { char state_fname[256]; char *fname; FILE *f; ASSERTZH; - yaz_log(LOG_API,"zebra_get_state "); - zh->errCode=0; - sprintf (state_fname, "state.%s.LCK", zh->reg_name); - fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); - f = fopen (fname, "r"); + yaz_log(log_level, "zebra_get_state "); + + sprintf(state_fname, "state.%s.LCK", zh->reg_name); + fname = zebra_mk_fname(res_get(zh->res, "lockDir"), state_fname); + f = fopen(fname, "r"); *val = 'o'; *seqno = 0; if (f) { - fscanf (f, "%c %d", val, seqno); - fclose (f); + if (fscanf(f, "%c %d", val, seqno) != 2) + { + yaz_log(YLOG_ERRNO|YLOG_WARN, "fscan fail %s", + state_fname); + } + fclose(f); } - xfree (fname); - return 0; + xfree(fname); } -int zebra_begin_read (ZebraHandle zh) +ZEBRA_RES zebra_begin_read(ZebraHandle zh) { return zebra_begin_trans(zh, 0); } -int zebra_end_read (ZebraHandle zh) +ZEBRA_RES zebra_end_read(ZebraHandle zh) { return zebra_end_trans(zh); } @@ -1371,36 +1700,38 @@ static void read_res_for_transaction(ZebraHandle zh) v = res_get_prefix(zh->res, "openRW", group, "1"); zh->m_flag_rw = atoi(v); - v = res_get_prefix(zh->res, "fileVerboseLimit", group, "100000"); + v = res_get_prefix(zh->res, "fileVerboseLimit", group, "1000"); zh->m_file_verbose_limit = atoi(v); } -int zebra_begin_trans (ZebraHandle zh, int rw) +ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); + zebra_select_default_database(zh); if (!zh->res) { - zh->errCode = 2; - zh->errString = "zebra_begin_trans: no database selected"; - return -1; + zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, + "zebra_begin_trans: no database selected"); + return ZEBRA_FAIL; } ASSERTZHRES; - yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw); + yaz_log(log_level, "zebra_begin_trans rw=%d",rw); if (zh->user_perm) { if (rw && !strchr(zh->user_perm, 'w')) { - zh->errCode = 223; - zh->errString = 0; - return -1; + zebra_setError( + zh, + YAZ_BIB1_ES_PERMISSION_DENIED_ON_ES_CANNOT_MODIFY_OR_DELETE, + 0); + return ZEBRA_FAIL; } } - assert (zh->res); + assert(zh->res); if (rw) { - int pass; int seqno = 0; char val = '?'; const char *rval = 0; @@ -1413,98 +1744,90 @@ int zebra_begin_trans (ZebraHandle zh, int rw) } if (zh->trans_no != 1) { - zh->errCode = 2; - zh->errString = "zebra_begin_trans: write trans not allowed within read trans"; - return -1; + zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, + "zebra_begin_trans: no write trans within read"); + return ZEBRA_FAIL; } if (zh->reg) { - resultSetInvalidate (zh); - zebra_register_close (zh->service, zh->reg); + resultSetInvalidate(zh); + zebra_register_close(zh->service, zh->reg); } zh->trans_w_no = zh->trans_no; - zh->errCode=0; - zh->records_inserted = 0; zh->records_updated = 0; zh->records_deleted = 0; zh->records_processed = 0; + zh->records_skipped = 0; #if HAVE_SYS_TIMES_H - times (&zh->tms1); + times(&zh->tms1); #endif /* lock */ if (zh->shadow_enable) - rval = res_get (zh->res, "shadow"); + rval = res_get(zh->res, "shadow"); - for (pass = 0; pass < 2; pass++) + if (rval) { - if (rval) + zebra_lock_r(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); + } + else + { + zebra_lock_w(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); + } + zebra_get_state(zh, &val, &seqno); + if (val != 'o') + { + /* either we didn't finish commit or shadow is dirty */ + if (!rval) { - zebra_lock_r (zh->lock_normal); - zebra_lock_w (zh->lock_shadow); + yaz_log(YLOG_WARN, "previous transaction did not finish " + "(shadow disabled)"); } - else + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + if (zebra_commit(zh)) { - zebra_lock_w (zh->lock_normal); - zebra_lock_w (zh->lock_shadow); + zh->trans_no--; + zh->trans_w_no = 0; + return ZEBRA_FAIL; } - - zebra_get_state (zh, &val, &seqno); - if (val == 'c') + if (rval) { - yaz_log (LOG_WARN, "previous transaction didn't finish commit"); - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); - zebra_commit (zh); - continue; + zebra_lock_r(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); } - else if (val == 'd') + else { - if (rval) - { - BFiles bfs = bfs_create (res_get (zh->res, "shadow"), - zh->path_reg); - yaz_log (LOG_WARN, "previous transaction didn't reach commit"); - bf_commitClean (bfs, rval); - bfs_destroy (bfs); - } - else - { - yaz_log (LOG_WARN, "your previous transaction didn't finish"); - } + zebra_lock_w(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); } - break; } - if (pass == 2) - { - yaz_log (LOG_FATAL, "zebra_begin_trans couldn't finish commit"); - abort(); - return -1; - } - zebra_set_state (zh, 'd', seqno); + + zebra_set_state(zh, 'd', seqno); - zh->reg = zebra_register_open (zh->service, zh->reg_name, - 1, rval ? 1 : 0, zh->res, - zh->path_reg); + zh->reg = zebra_register_open(zh->service, zh->reg_name, + 1, rval ? 1 : 0, zh->res, + zh->path_reg); if (zh->reg) zh->reg->seqno = seqno; else { - zebra_set_state (zh, 'o', seqno); - - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); zh->trans_no--; zh->trans_w_no = 0; - zh->errCode = 2; - zh->errString = "zebra_begin_trans: cannot open register"; - yaz_log(LOG_FATAL, zh->errString); - return -1; + zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, + "zebra_begin_trans: cannot open register"); + yaz_log(YLOG_FATAL, "%s", zh->errString); + return ZEBRA_FAIL; } + zebraExplain_curDatabase(zh->reg->zei, zh->basenames[0]); } else { @@ -1516,26 +1839,24 @@ int zebra_begin_trans (ZebraHandle zh, int rw) if (zh->trans_no != 1) { - zebra_flush_reg (zh); - return 0; + return zebra_flush_reg(zh); } - zh->errCode=0; #if HAVE_SYS_TIMES_H - times (&zh->tms1); + times(&zh->tms1); #endif if (!zh->res) { (zh->trans_no)--; - zh->errCode = 109; - return -1; + zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; + return ZEBRA_FAIL; } if (!zh->lock_normal || !zh->lock_shadow) { (zh->trans_no)--; - zh->errCode = 2; - return -1; + zh->errCode = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + return ZEBRA_FAIL; } - zebra_get_state (zh, &val, &seqno); + zebra_get_state(zh, &val, &seqno); if (val == 'd') val = 'o'; @@ -1543,64 +1864,66 @@ int zebra_begin_trans (ZebraHandle zh, int rw) dirty = 1; else if (seqno != zh->reg->seqno) { - yaz_log (LOG_DEBUG, "reopen seqno cur/old %d/%d", - seqno, zh->reg->seqno); + yaz_log(YLOG_DEBUG, "reopen seqno cur/old %d/%d", + seqno, zh->reg->seqno); dirty = 1; } else if (zh->reg->last_val != val) { - yaz_log (LOG_DEBUG, "reopen last cur/old %d/%d", - val, zh->reg->last_val); + yaz_log(YLOG_DEBUG, "reopen last cur/old %d/%d", + val, zh->reg->last_val); dirty = 1; } if (!dirty) - return 0; + return ZEBRA_OK; if (val == 'c') - zebra_lock_r (zh->lock_shadow); + zebra_lock_r(zh->lock_shadow); else - zebra_lock_r (zh->lock_normal); + zebra_lock_r(zh->lock_normal); if (zh->reg) { - resultSetInvalidate (zh); - zebra_register_close (zh->service, zh->reg); + resultSetInvalidate(zh); + zebra_register_close(zh->service, zh->reg); } - zh->reg = zebra_register_open (zh->service, zh->reg_name, - 0, val == 'c' ? 1 : 0, - zh->res, zh->path_reg); + zh->reg = zebra_register_open(zh->service, zh->reg_name, + 0, val == 'c' ? 1 : 0, + zh->res, zh->path_reg); if (!zh->reg) { - zebra_unlock (zh->lock_normal); - zebra_unlock (zh->lock_shadow); + zebra_unlock(zh->lock_normal); + zebra_unlock(zh->lock_shadow); zh->trans_no--; - zh->errCode = 109; - return -1; + zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; + return ZEBRA_FAIL; } zh->reg->last_val = val; zh->reg->seqno = seqno; } read_res_for_transaction(zh); - return 0; + return ZEBRA_OK; } -int zebra_end_trans (ZebraHandle zh) +ZEBRA_RES zebra_end_trans(ZebraHandle zh) { - ASSERTZH; ZebraTransactionStatus dummy; - yaz_log(LOG_API,"zebra_end_trans"); + + yaz_log(log_level, "zebra_end_trans"); + ZEBRA_CHECK_HANDLE(zh); return zebra_end_transaction(zh, &dummy); } -int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) +ZEBRA_RES zebra_end_transaction(ZebraHandle zh, ZebraTransactionStatus *status) { char val; int seqno; const char *rval; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); + assert(status); - yaz_log(LOG_API,"zebra_end_transaction"); + yaz_log(log_level, "zebra_end_transaction"); status->processed = 0; status->inserted = 0; @@ -1611,287 +1934,628 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) if (!zh->res || !zh->reg) { - zh->errCode = 2; - zh->errString = "zebra_end_trans: no open transaction"; - return -1; + zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, + "zebra_end_trans: no open transaction"); + return ZEBRA_FAIL; } if (zh->trans_no != zh->trans_w_no) { zh->trans_no--; if (zh->trans_no != 0) - return 0; + return ZEBRA_OK; /* release read lock */ - zebra_unlock (zh->lock_normal); - zebra_unlock (zh->lock_shadow); + zebra_unlock(zh->lock_normal); + zebra_unlock(zh->lock_shadow); } else { /* release write lock */ zh->trans_no--; zh->trans_w_no = 0; - yaz_log (LOG_DEBUG, "zebra_end_trans"); - rval = res_get (zh->res, "shadow"); + yaz_log(YLOG_DEBUG, "zebra_end_trans"); + rval = res_get(zh->res, "shadow"); - zebraExplain_runNumberIncrement (zh->reg->zei, 1); + zebraExplain_runNumberIncrement(zh->reg->zei, 1); - zebra_flush_reg (zh); + zebra_flush_reg(zh); - resultSetInvalidate (zh); + resultSetInvalidate(zh); - zebra_register_close (zh->service, zh->reg); + zebra_register_close(zh->service, zh->reg); zh->reg = 0; - 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); + yaz_log(YLOG_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); status->processed = zh->records_processed; status->inserted = zh->records_inserted; status->updated = zh->records_updated; status->deleted = zh->records_deleted; - zebra_get_state (zh, &val, &seqno); + zebra_get_state(zh, &val, &seqno); if (val != 'd') { - BFiles bfs = bfs_create (rval, zh->path_reg); - yaz_log (LOG_DEBUG, "deleting shadow val=%c", val); - bf_commitClean (bfs, rval); - bfs_destroy (bfs); + BFiles bfs = bfs_create(rval, zh->path_reg); + bf_commitClean(bfs, rval); + bfs_destroy(bfs); } if (!rval) seqno++; - zebra_set_state (zh, 'o', seqno); - - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); + zebra_set_state(zh, 'o', seqno); + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); } #if HAVE_SYS_TIMES_H - times (&zh->tms2); - logf (LOG_LOG, "user/system: %ld/%ld", - (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), - (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); + times(&zh->tms2); + yaz_log(log_level, "user/system: %ld/%ld", + (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), + (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); status->utime = (long) (zh->tms2.tms_utime - zh->tms1.tms_utime); status->stime = (long) (zh->tms2.tms_stime - zh->tms1.tms_stime); #endif - return 0; + return ZEBRA_OK; } -int zebra_repository_update (ZebraHandle zh, const char *path) +ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path) { - ASSERTZH; - assert(path); - zh->errCode=0; - logf (LOG_API, "updating %s", path); - repositoryUpdate (zh, path); - return zh->errCode; + return zebra_repository_index(zh, path, action_update); +} + +ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path) +{ + return zebra_repository_index(zh, path, action_delete); } -int zebra_repository_delete (ZebraHandle zh, const char *path) +ZEBRA_RES zebra_repository_index(ZebraHandle zh, const char *path, + enum zebra_recctrl_action_t action) { ASSERTZH; assert(path); - zh->errCode=0; - logf (LOG_API, "deleting %s", path); - repositoryDelete (zh, path); - return zh->errCode; + + if (action == action_update) + yaz_log(log_level, "updating %s", path); + else if (action == action_delete) + yaz_log(log_level, "deleting %s", path); + else if (action == action_a_delete) + yaz_log(log_level, "attempt deleting %s", path); + else + yaz_log(log_level, "update action=%d", (int) action); + + if (zh->m_record_id && !strcmp(zh->m_record_id, "file")) + return zebra_update_file_match(zh, path); + else + return zebra_update_from_path(zh, path, action); } -int zebra_repository_show (ZebraHandle zh, const char *path) +ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path) { ASSERTZH; assert(path); - yaz_log(LOG_API,"zebra_repository_show"); - zh->errCode=0; - repositoryShow (zh, path); - return zh->errCode; + yaz_log(log_level, "zebra_repository_show"); + repositoryShow(zh, path); + return ZEBRA_OK; } -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; + ZEBRA_RES res = ZEBRA_OK; + ASSERTZH; - zh->errCode=0; + yaz_log(log_level, "zebra_commit_ex clean_only=%d", clean_only); + zebra_select_default_database(zh); if (!zh->res) { - zh->errCode = 109; - return -1; + zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; + return ZEBRA_FAIL; } - rval = res_get (zh->res, "shadow"); + rval = res_get(zh->res, "shadow"); if (!rval) { - logf (LOG_WARN, "Cannot perform commit"); - logf (LOG_WARN, "No shadow area defined"); - return 0; + yaz_log(YLOG_WARN, "Cannot perform commit - No shadow area defined"); + return ZEBRA_OK; } - zebra_lock_w (zh->lock_normal); - zebra_lock_r (zh->lock_shadow); + zebra_lock_w(zh->lock_normal); + zebra_lock_r(zh->lock_shadow); - bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg); + 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); - zebra_get_state (zh, &val, &seqno); + if (val == 'd') + { + /* shadow area is dirty and so we must throw it away */ + yaz_log(YLOG_WARN, "previous transaction didn't reach commit"); + clean_only = 1; + } + else if (val == 'c') + { + /* commit has started. We can not remove it anymore */ + clean_only = 0; + } if (rval && *rval) - bf_cache (bfs, rval); - if (bf_commitExists (bfs)) + bf_cache(bfs, rval); + if (bf_commitExists(bfs)) { if (clean_only) - zebra_set_state (zh, 'd', seqno); + zebra_set_state(zh, 'd', seqno); else { - zebra_set_state (zh, 'c', seqno); + zebra_set_state(zh, 'c', seqno); - logf (LOG_DEBUG, "commit start"); - bf_commitExec (bfs); -#ifndef WIN32 - sync (); -#endif + yaz_log(log_level, "commit start"); + if (bf_commitExec(bfs)) + res = ZEBRA_FAIL; + } + if (res == ZEBRA_OK) + { + 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_shadow); + } + else + { + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + yaz_log(YLOG_WARN, "zebra_commit: failed"); } - logf (LOG_DEBUG, "commit clean"); - bf_commitClean (bfs, rval); - seqno++; - zebra_set_state (zh, 'o', seqno); } else { - logf (LOG_LOG, "nothing to commit"); + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + yaz_log(log_level, "nothing to commit"); } - bfs_destroy (bfs); + bfs_destroy(bfs); - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); - return 0; + return res; } -int zebra_clean (ZebraHandle zh) +ZEBRA_RES zebra_clean(ZebraHandle zh) { - ASSERTZH; - yaz_log(LOG_API,"zebra_clean"); + yaz_log(log_level, "zebra_clean"); + ZEBRA_CHECK_HANDLE(zh); return zebra_commit_ex(zh, 1); } -int zebra_commit (ZebraHandle zh) +ZEBRA_RES zebra_commit(ZebraHandle zh) { - ASSERTZH; - yaz_log(LOG_API,"zebra_commit"); + yaz_log(log_level, "zebra_commit"); + ZEBRA_CHECK_HANDLE(zh); return zebra_commit_ex(zh, 0); } -int zebra_init (ZebraHandle zh) + +ZEBRA_RES zebra_init(ZebraHandle zh) { const char *rval; BFiles bfs = 0; - ASSERTZH; - yaz_log(LOG_API,"zebra_init"); - zh->errCode=0; + yaz_log(log_level, "zebra_init"); + + ZEBRA_CHECK_HANDLE(zh); + + zebra_select_default_database(zh); if (!zh->res) { - zh->errCode = 109; - return -1; + zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, + "cannot select default database"); + return ZEBRA_FAIL; } - rval = res_get (zh->res, "shadow"); + 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; + { + zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "bfs_create"); + return ZEBRA_FAIL; + } if (rval && *rval) - bf_cache (bfs, rval); + bf_cache(bfs, rval); - bf_reset (bfs); - bfs_destroy (bfs); - zebra_set_state (zh, 'o', 0); - return 0; + bf_reset(bfs); + bfs_destroy(bfs); + zebra_set_state(zh, 'o', 0); + return ZEBRA_OK; } -int zebra_compact (ZebraHandle zh) +ZEBRA_RES zebra_compact(ZebraHandle zh) { BFiles bfs; - ASSERTZH; - yaz_log(LOG_API,"zebra_compact"); - zh->errCode=0; + + yaz_log(log_level, "zebra_compact"); + ZEBRA_CHECK_HANDLE(zh); if (!zh->res) { - zh->errCode = 109; - return -1; + zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; + return ZEBRA_FAIL; + } + bfs = bfs_create(res_get(zh->res, "register"), zh->path_reg); + inv_compact(bfs); + bfs_destroy(bfs); + return ZEBRA_OK; +} + +#define ZEBRA_CHECK_DICT 1 +#define ZEBRA_CHECK_ISAM 2 + +static ZEBRA_RES zebra_record_check(ZebraHandle zh, Record rec, + zint *no_keys, int message_limit, + unsigned flags, + zint *no_long_dict_entries, + zint *no_failed_dict_lookups, + zint *no_invalid_keys, + zint *no_invalid_dict_infos, + zint *no_invalid_isam_entries) +{ + ZEBRA_RES res = ZEBRA_OK; + zebra_rec_keys_t keys = zebra_rec_keys_open(); + zebra_rec_keys_set_buf(keys, rec->info[recInfo_delKeys], + rec->size[recInfo_delKeys], 0); + + *no_keys = 0; + if (!zebra_rec_keys_rewind(keys)) + { + ; } - bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg); - inv_compact (bfs); - bfs_destroy (bfs); - return 0; + else + { + size_t slen; + const char *str; + struct it_key key_in; + NMEM nmem = nmem_create(); + + while (zebra_rec_keys_read(keys, &str, &slen, &key_in)) + { + int do_fail = 0; + int ord = CAST_ZINT_TO_INT(key_in.mem[0]); + char ord_buf[IT_MAX_WORD+20]; + int ord_len = key_SU_encode(ord, ord_buf); + char *info = 0; + + (*no_keys)++; + + if (key_in.len < 2 || key_in.len > IT_KEY_LEVEL_MAX) + { + res = ZEBRA_FAIL; + (*no_invalid_keys)++; + if (*no_invalid_keys <= message_limit) + { + do_fail = 1; + yaz_log(YLOG_WARN, "Record " ZINT_FORMAT + ": unexpected key length %d", + rec->sysno, key_in.len); + } + } + if (ord_len + slen >= sizeof(ord_buf)-1) + { + res = ZEBRA_FAIL; + (*no_long_dict_entries)++; + if (*no_long_dict_entries <= message_limit) + { + do_fail = 1; + /* so bad it can not fit into our ord_buf */ + yaz_log(YLOG_WARN, "Record " ZINT_FORMAT + ": long dictionary entry %d + %d", + rec->sysno, ord_len, (int) slen); + } + continue; + } + memcpy(ord_buf + ord_len, str, slen); + ord_buf[ord_len + slen] = '\0'; + if (ord_len + slen >= IT_MAX_WORD) + { + res = ZEBRA_FAIL; + (*no_long_dict_entries)++; + if (*no_long_dict_entries <= message_limit) + { + do_fail = 1; + yaz_log(YLOG_WARN, "Record " ZINT_FORMAT + ": long dictionary entry %d + %d", + rec->sysno, (int) ord_len, (int) slen); + } + } + if ((flags & ZEBRA_CHECK_DICT) == 0) + continue; + info = dict_lookup(zh->reg->dict, ord_buf); + if (!info) + { + res = ZEBRA_FAIL; + (*no_failed_dict_lookups)++; + if (*no_failed_dict_lookups <= message_limit) + { + do_fail = 1; + yaz_log(YLOG_WARN, "Record " ZINT_FORMAT + ": term do not exist in dictionary", rec->sysno); + } + } + else if (flags & ZEBRA_CHECK_ISAM) + { + ISAM_P pos; + + if (*info != sizeof(pos)) + { + res = ZEBRA_FAIL; + (*no_invalid_dict_infos)++; + if (*no_invalid_dict_infos <= message_limit) + { + do_fail = 1; + yaz_log(YLOG_WARN, "Record " ZINT_FORMAT + ": long dictionary entry %d + %d", + rec->sysno, (int) ord_len, (int) slen); + } + } + else + { + int scope = 1; + memcpy(&pos, info+1, sizeof(pos)); + if (zh->reg->isamb) + { + ISAMB_PP ispt = isamb_pp_open(zh->reg->isamb, pos, + scope); + if (!ispt) + { + res = ZEBRA_FAIL; + (*no_invalid_isam_entries)++; + if (*no_invalid_isam_entries <= message_limit) + { + do_fail = 1; + yaz_log(YLOG_WARN, "Record " ZINT_FORMAT + ": isamb_pp_open entry " ZINT_FORMAT + " not found", + rec->sysno, pos); + } + } + else if (zh->m_staticrank) + { + isamb_pp_close(ispt); + } + else + { + struct it_key until_key; + struct it_key isam_key; + int r; + int i = 0; + + until_key.len = key_in.len - 1; + for (i = 0; i < until_key.len; i++) + until_key.mem[i] = key_in.mem[i+1]; + + if (until_key.mem[0] == 0) + until_key.mem[0] = rec->sysno; + r = isamb_pp_forward(ispt, &isam_key, &until_key); + if (r != 1) + { + res = ZEBRA_FAIL; + (*no_invalid_isam_entries)++; + if (*no_invalid_isam_entries <= message_limit) + { + do_fail = 1; + yaz_log(YLOG_WARN, "Record " ZINT_FORMAT + ": isamb_pp_forward " ZINT_FORMAT + " returned no entry", + rec->sysno, pos); + } + } + else + { + int cmp = key_compare(&until_key, &isam_key); + if (cmp != 0) + { + res = ZEBRA_FAIL; + (*no_invalid_isam_entries)++; + if (*no_invalid_isam_entries + <= message_limit) + { + do_fail = 1; + yaz_log(YLOG_WARN, "Record " + ZINT_FORMAT + ": isamb_pp_forward " + ZINT_FORMAT + " returned different entry", + rec->sysno, pos); + + key_logdump_txt(YLOG_LOG, + &until_key, + "until"); + + key_logdump_txt(YLOG_LOG, + &isam_key, + "isam"); + + } + } + } + isamb_pp_close(ispt); + } + + } + } + } + if (do_fail) + { + zebra_it_key_str_dump(zh, &key_in, str, + slen, nmem, YLOG_LOG); + nmem_reset(nmem); + } + } + nmem_destroy(nmem); + } + zebra_rec_keys_close(keys); + return res; } -int zebra_result (ZebraHandle zh, int *code, char **addinfo) +ZEBRA_RES zebra_register_check(ZebraHandle zh, const char *spec) { - ASSERTZH; - yaz_log(LOG_API,"zebra_result"); - *code = zh->errCode; - *addinfo = zh->errString; - return 0; + ZEBRA_RES res = ZEBRA_FAIL; + unsigned flags = 0; + int message_limit = 10; + + if (!spec || *spec == '\0' + || !strcmp(spec, "dict") || !strcmp(spec, "default")) + flags = ZEBRA_CHECK_DICT; + else if (!strcmp(spec, "isam") || !strcmp(spec, "full")) + flags = ZEBRA_CHECK_DICT|ZEBRA_CHECK_ISAM; + else if (!strcmp(spec, "quick")) + flags = 0; + else + return ZEBRA_FAIL; + + yaz_log(YLOG_LOG, "zebra_register_check begin flags=%u message_limit=%d", + flags, message_limit); + if (zebra_begin_read(zh) == ZEBRA_OK) + { + zint no_records_total = 0; + zint no_records_fail = 0; + zint total_keys = 0; + + if (zh->reg) + { + Record rec = rec_get_root(zh->reg->records); + + zint no_long_dict_entries = 0; + zint no_failed_dict_lookups = 0; + zint no_invalid_keys = 0; + zint no_invalid_dict_infos = 0; + zint no_invalid_isam_entries = 0; + + res = ZEBRA_OK; + while (rec) + { + Record r1; + zint no_keys; + + if (zebra_record_check(zh, rec, &no_keys, message_limit, + flags, + &no_long_dict_entries, + &no_failed_dict_lookups, + &no_invalid_keys, + &no_invalid_dict_infos, + &no_invalid_isam_entries + ) + != ZEBRA_OK) + { + res = ZEBRA_FAIL; + no_records_fail++; + } + + r1 = rec_get_next(zh->reg->records, rec); + rec_free(&rec); + rec = r1; + no_records_total++; + total_keys += no_keys; + } + yaz_log(YLOG_LOG, "records total: " ZINT_FORMAT, + no_records_total); + yaz_log(YLOG_LOG, "records fail: " ZINT_FORMAT, + no_records_fail); + yaz_log(YLOG_LOG, "total keys: " ZINT_FORMAT, + total_keys); + yaz_log(YLOG_LOG, "long dict entries: " ZINT_FORMAT, + no_long_dict_entries); + if (flags & ZEBRA_CHECK_DICT) + { + yaz_log(YLOG_LOG, "failed dict lookups: " ZINT_FORMAT, + no_failed_dict_lookups); + yaz_log(YLOG_LOG, "invalid dict infos: " ZINT_FORMAT, + no_invalid_dict_infos); + } + if (flags & ZEBRA_CHECK_ISAM) + yaz_log(YLOG_LOG, "invalid isam entries: " ZINT_FORMAT, + no_invalid_isam_entries); + } + zebra_end_read(zh); + } + yaz_log(YLOG_LOG, "zebra_register_check end ret=%d", res); + return res; } -int zebra_shadow_enable (ZebraHandle zh, int value) +void zebra_result(ZebraHandle zh, int *code, char **addinfo) +{ + yaz_log(log_level, "zebra_result"); + 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_API,"zebra_shadow_enable"); - zh->errCode=0; + yaz_log(log_level, "zebra_shadow_enable"); zh->shadow_enable = value; - return 0; } -int zebra_record_encoding (ZebraHandle zh, const char *encoding) +ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) { - ASSERTZH; + yaz_log(log_level, "zebra_octet_term_encoding %s", encoding); + ZEBRA_CHECK_HANDLE(zh); assert(encoding); - yaz_log(LOG_API,"zebra_record_encoding"); - zh->errCode=0; - xfree (zh->record_encoding); - - /* - * Fixme! - * Something about charset aliases. Oleg??? - */ if (zh->iconv_to_utf8 != 0) yaz_iconv_close(zh->iconv_to_utf8); if (zh->iconv_from_utf8 != 0) yaz_iconv_close(zh->iconv_from_utf8); - zh->record_encoding = xstrdup (encoding); - - logf(LOG_DEBUG, "Reset record encoding: %s", encoding); - zh->iconv_to_utf8 = - yaz_iconv_open ("UTF-8", encoding); + yaz_iconv_open("UTF-8", encoding); if (zh->iconv_to_utf8 == 0) - yaz_log (LOG_WARN, "iconv: %s to UTF-8 unsupported", encoding); + yaz_log(YLOG_WARN, "iconv: %s to UTF-8 unsupported", encoding); zh->iconv_from_utf8 = - yaz_iconv_open (encoding, "UTF-8"); + yaz_iconv_open(encoding, "UTF-8"); if (zh->iconv_to_utf8 == 0) - yaz_log (LOG_WARN, "iconv: UTF-8 to %s unsupported", encoding); + yaz_log(YLOG_WARN, "iconv: UTF-8 to %s unsupported", encoding); - return 0; + return ZEBRA_OK; } -int zebra_set_resource(ZebraHandle zh, const char *name, const char *value) +ZEBRA_RES zebra_record_encoding(ZebraHandle zh, const char *encoding) +{ + yaz_log(log_level, "zebra_record_encoding"); + ZEBRA_CHECK_HANDLE(zh); + xfree(zh->record_encoding); + zh->record_encoding = 0; + if (encoding) + zh->record_encoding = xstrdup(encoding); + return ZEBRA_OK; +} + +void zebra_set_resource(ZebraHandle zh, const char *name, const char *value) { - ASSERTZH; assert(name); assert(value); - yaz_log(LOG_API,"zebra_set_resource %s:%s",name,value); - zh->errCode=0; + yaz_log(log_level, "zebra_set_resource %s:%s", name, value); + ASSERTZH; res_set(zh->res, name, value); - return 0; } const char *zebra_get_resource(ZebraHandle zh, @@ -1900,284 +2564,148 @@ const char *zebra_get_resource(ZebraHandle zh, const char *v; ASSERTZH; assert(name); - assert(defaultvalue); - v= res_get_def( zh->res, name, (char *)defaultvalue); - zh->errCode=0; - yaz_log(LOG_API,"zebra_get_resource %s:%s",name,v); + v = res_get_def(zh->res, name,(char *)defaultvalue); + yaz_log(log_level, "zebra_get_resource %s:%s", name, v); return v; } /* moved from zebra_api_ext.c by pop */ /* FIXME: Should this really be public??? -Heikki */ -int zebra_trans_no (ZebraHandle zh) +int zebra_trans_no(ZebraHandle zh) { + yaz_log(log_level, "zebra_trans_no"); ASSERTZH; - yaz_log(LOG_API,"zebra_trans_no"); return zh->trans_no; } -int zebra_get_shadow_enable (ZebraHandle zh) +int zebra_get_shadow_enable(ZebraHandle zh) { + yaz_log(log_level, "zebra_get_shadow_enable"); ASSERTZH; - yaz_log(LOG_API,"zebra_get_shadow_enable"); - return (zh->shadow_enable); + return zh->shadow_enable; } -int zebra_set_shadow_enable (ZebraHandle zh, int value) +void zebra_set_shadow_enable(ZebraHandle zh, int value) { + yaz_log(log_level, "zebra_set_shadow_enable %d",value); ASSERTZH; - yaz_log(LOG_API,"zebra_set_shadow_enable %d",value); zh->shadow_enable = value; - return 0; } -/* almost the same as zebra_records_retrieve ... but how did it work? - I mean for multiple records ??? CHECK ??? */ -void api_records_retrieve (ZebraHandle zh, ODR stream, - const char *setname, Z_RecordComposition *comp, - oid_value input_format, int num_recs, - ZebraRetrievalRecord *recs) +ZEBRA_RES zebra_add_record(ZebraHandle zh, + const char *buf, int buf_size) { - ZebraPosSet poset; - int i, *pos_array; - ASSERTZH; - assert(stream); - assert(setname); - assert(comp); - assert(recs); - assert(num_recs>0); - yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs); - - if (!zh->res) - { - zh->errCode = 30; - zh->errString = odr_strdup (stream, setname); - return; - } - - zh->errCode = 0; - - if (zebra_begin_read (zh)) - return; - - pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); - for (i = 0; ierrCode = 30; - zh->errString = nmem_strdup (stream->mem, setname); - } - else - { - for (i = 0; ierrCode = 13; - zh->errString = odr_strdup (stream, num_str); - break; - } - - } - zebraPosSetDestroy (zh, poset, num_recs); - } - zebra_end_read (zh); - xfree (pos_array); -} - - -/* --------------------------------------------------------------------------- - Record insert(=update), delete - - If sysno is provided, then it's used to identify the record. - If not, and match_criteria is provided, then sysno is guessed - If not, and a record is provided, then sysno is got from there -NOTE: Now returns 0 at success and updates sysno, which is an int* - 20-jun-2003 Heikki -*/ - -int zebra_add_record(ZebraHandle zh, - const char *buf, int buf_size) -{ - SYSNO sysno = 0; - return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0); + return zebra_update_record(zh, action_update, + 0 /* record type */, + 0 /* sysno */ , + 0 /* match */, + 0 /* fname */, + buf, buf_size); } -int zebra_insert_record (ZebraHandle zh, - const char *recordType, - SYSNO *sysno, const char *match, const char *fname, - const char *buf, int buf_size, int force_update) +ZEBRA_RES zebra_update_record(ZebraHandle zh, + enum zebra_recctrl_action_t action, + const char *recordType, + zint *sysno, const char *match, + const char *fname, + const char *buf, int buf_size) { - int res; - ASSERTZH; - assert(sysno); - assert(buf); - yaz_log(LOG_API, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno); + ZEBRA_RES res; - if (buf_size < 1) buf_size = strlen(buf); + ZEBRA_CHECK_HANDLE(zh); - if (zebra_begin_trans(zh, 1)) - return 1; - res = buffer_extract_record (zh, buf, buf_size, - 0, /* delete_flag */ - 0, /* test_mode */ - recordType, - sysno, - match, fname, - 0, - 0); /* allow_update */ - zebra_end_trans(zh); - return res; -} - -int zebra_update_record (ZebraHandle zh, - const char *recordType, - SYSNO* sysno, const char *match, const char *fname, - const char *buf, int buf_size, - int force_update) -{ - int res; - ASSERTZH; - assert(sysno); assert(buf); - yaz_log(LOG_API, "zebra_update_record sysno=" ZINT_FORMAT, *sysno); - - if (buf_size < 1) buf_size = strlen(buf); - - if (zebra_begin_trans(zh, 1)) - return 1; - res = buffer_extract_record (zh, buf, buf_size, - 0, /* delete_flag */ - 0, /* test_mode */ - recordType, - sysno, - match, fname, - force_update, - 1); /* allow_update */ - zebra_end_trans(zh); + yaz_log(log_level, "zebra_update_record"); + if (sysno) + yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno); + + if (buf_size < 1) + buf_size = strlen(buf); + + if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) + return ZEBRA_FAIL; + res = zebra_buffer_extract_record(zh, buf, buf_size, + action, + recordType, + sysno, + match, + fname); + if (zebra_end_trans(zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + res = ZEBRA_FAIL; + } return res; } -int zebra_delete_record (ZebraHandle zh, - const char *recordType, - SYSNO *sysno, const char *match, const char *fname, - const char *buf, int buf_size, - int force_update) -{ - int res; - ASSERTZH; - assert(sysno); - assert(buf); - yaz_log(LOG_API, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno); - - if (buf_size < 1) buf_size = strlen(buf); - - if (zebra_begin_trans(zh, 1)) - return 1; - res = buffer_extract_record (zh, buf, buf_size, - 1, /* delete_flag */ - 0, /* test_mode */ - recordType, - sysno, - match,fname, - force_update, - 1); /* allow_update */ - zebra_end_trans(zh); - return res; -} - /* --------------------------------------------------------------------------- - Searching + Searching */ -int zebra_search_PQF (ZebraHandle zh, const char *pqf_query, - const char *setname, int *numhits) +ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query, + const char *setname, zint *hits) { - int hits = 0; - int res=-1; + 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); - yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, pqf_query); + yaz_log(log_level, "zebra_search_PQF s=%s q=%s", setname, pqf_query); - query = p_query_rpn (odr, PROTO_Z3950, pqf_query); + query = p_query_rpn(odr, pqf_query); if (!query) - yaz_log (LOG_WARN, "bad query %s\n", pqf_query); + { + yaz_log(YLOG_WARN, "bad query %s\n", pqf_query); + zh->errCode = YAZ_BIB1_MALFORMED_QUERY; + res = ZEBRA_FAIL; + } else - res=zebra_search_RPN (zh, odr, query, setname, &hits); + res = zebra_search_RPN(zh, odr, query, setname, &lhits); odr_destroy(odr); - yaz_log(LOG_API,"Hits: %d",hits); + yaz_log(log_level, "Hits: " ZINT_FORMAT, lhits); - if (numhits) - *numhits=hits; + if (hits) + *hits = lhits; return res; } /* --------------------------------------------------------------------------- - Sort - a simplified interface, with optional read locks. + Sort - a simplified interface, with optional read locks. */ -int zebra_sort_by_specstr (ZebraHandle zh, - ODR stream, - const char *sort_spec, - const char *output_setname, - const char **input_setnames) +int zebra_sort_by_specstr(ZebraHandle zh, ODR stream, + const char *sort_spec, + const char *output_setname, + const char **input_setnames) { 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); assert(input_setnames); - sort_sequence = yaz_sort_spec (stream, sort_spec); - yaz_log(LOG_API,"sort (FIXME) "); + sort_sequence = yaz_sort_spec(stream, sort_spec); + yaz_log(log_level, "sort (FIXME) "); if (!sort_sequence) { - logf(LOG_WARN,"invalid sort specs '%s'", sort_spec); - zh->errCode = 207; + yaz_log(YLOG_WARN, "invalid sort specs '%s'", sort_spec); + zh->errCode = YAZ_BIB1_CANNOT_SORT_ACCORDING_TO_SEQUENCE; return -1; } @@ -2185,13 +2713,75 @@ int zebra_sort_by_specstr (ZebraHandle zh, put a NULL at the end of list */ while (input_setnames[num_input_setnames]) num_input_setnames++; - if (zebra_begin_read (zh)) + if (zebra_begin_read(zh)) return -1; - resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, - output_setname, sort_sequence, &sort_status); + resultSetSort(zh, stream->mem, num_input_setnames, input_setnames, + output_setname, sort_sequence, &sort_status); zebra_end_read(zh); return sort_status; } +/* --------------------------------------------------------------------------- + Get BFS for Zebra system (to make alternative storage methods) +*/ +struct BFiles_struct *zebra_get_bfs(ZebraHandle zh) +{ + if (zh && zh->reg) + return zh->reg->bfs; + return 0; +} + + +/* --------------------------------------------------------------------------- + Set limit for search/scan +*/ +ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids) +{ + ZEBRA_CHECK_HANDLE(zh); + zebra_limit_destroy(zh->m_limit); + zh->m_limit = zebra_limit_create(complement_flag, ids); + return ZEBRA_OK; +} + +/* + Set Error code + addinfo +*/ +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; +} + +void zebra_setError_zint(ZebraHandle zh, int code, zint i) +{ + char vstr[60]; + sprintf(vstr, ZINT_FORMAT, i); + + zh->errCode = code; + nmem_reset(zh->nmem_error); + 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 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +