X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=dda541fecff86a358034c63228440113a5abc4ef;hp=3296732cd723caa5653c2cb19c838a3940b3afc2;hb=4097bac1dce126e79ce1550fad8b2034a311ff80;hpb=ac300df2169e3dcbdf9ab726349925cc3a122028 diff --git a/index/zebraapi.c b/index/zebraapi.c index 3296732..dda541f 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,5 +1,5 @@ -/* $Id: zebraapi.c,v 1.206 2006-03-26 14:17:01 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: zebraapi.c,v 1.269 2007-12-20 11:15:42 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ 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 + */ #include @@ -36,9 +36,11 @@ 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 @@ -53,30 +55,41 @@ static int log_level_initialized = 0; static void zebra_open_res(ZebraHandle zh); static void zebra_close_res(ZebraHandle zh); -static void zebra_chdir (ZebraService zs) +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 ; ASSERTZS; yaz_log(log_level, "zebra_chdir"); - dir = res_get (zs->global_res, "chdir"); + dir = res_get(zs->global_res, "chdir"); if (!dir) return; - yaz_log (YLOG_DEBUG, "chdir %s", dir); + yaz_log(YLOG_DEBUG, "chdir %s", dir); #ifdef WIN32 _chdir(dir); #else - chdir (dir); + chdir(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"); - zebraExplain_flush (zh->reg->zei, zh); - - extract_flushWriteKeys (zh, 1 /* final */); - zebra_index_merge (zh ); + 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, @@ -86,6 +99,12 @@ static struct zebra_register *zebra_register_open(ZebraService zs, const char *reg_path); static void zebra_register_close(ZebraService zs, struct zebra_register *reg); +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; @@ -102,7 +121,7 @@ ZebraHandle zebra_open(ZebraService zs, Res res) return 0; zh = (ZebraHandle) xmalloc(sizeof(*zh)); - yaz_log (YLOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); + yaz_log(YLOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); zh->service = zs; zh->reg = 0; /* no register attached yet */ @@ -115,7 +134,7 @@ ZebraHandle zebra_open(ZebraService zs, 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; @@ -129,28 +148,32 @@ ZebraHandle zebra_open(ZebraService zs, Res res) zh->shadow_enable = 1; zh->m_staticrank = 0; + zh->m_segment_indexing = 0; + + zh->break_handler_func = 0; + zh->break_handler_data = 0; - default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1"); + 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 (YLOG_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 (YLOG_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; @@ -161,14 +184,18 @@ ZebraHandle zebra_open(ZebraService zs, Res res) 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]; + + zebra_flock_init(); if (!log_level_initialized) { @@ -176,7 +203,9 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) log_level_initialized = 1; } - yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER, + zebra_get_version(version_str, system_str); + + yaz_log(YLOG_LOG, "zebra_start %s %s", version_str, configName ? configName : ""); if ((res = res_open(def_res, over_res))) @@ -194,17 +223,28 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) 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->sessions = 0; - zebra_chdir (zh); + zebra_chdir(zh); - 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"); + 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; @@ -212,7 +252,7 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) { zh->passwd_db = passwd_db_open(); if (!zh->passwd_db) - yaz_log (YLOG_WARN|YLOG_ERRNO, "passwd_db_open failed"); + yaz_log(YLOG_WARN|YLOG_ERRNO, "passwd_db_open failed"); else { if (passwd_plain) @@ -232,16 +272,25 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) } } - zh->path_root = res_get (zh->global_res, "root"); + 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); @@ -251,16 +300,16 @@ 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]; - sprintf (resource_str, "dict.%.100s.pagesize", name); + sprintf(resource_str, "dict.%.100s.pagesize", name); assert(bfs); assert(name); @@ -280,31 +329,32 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, const char *recordCompression = 0; const char *profilePath; char cwd[1024]; + int sort_type = ZEBRA_SORT_TYPE_FLAT; ZEBRA_RES ret = ZEBRA_OK; ASSERTZS; 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 (YLOG_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); @@ -314,7 +364,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, } if (useshadow) { - if (bf_cache (reg->bfs, res_get (res, "shadow")) == ZEBRA_FAIL) + if (bf_cache(reg->bfs, res_get(res, "shadow")) == ZEBRA_FAIL) { bfs_destroy(reg->bfs); data1_destroy(reg->dh); @@ -325,14 +375,15 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, } getcwd(cwd, sizeof(cwd)-1); - profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); - yaz_log(YLOG_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); - if ((reg->zebra_maps = zebra_maps_open (res, reg_path)) == 0) + reg->zebra_maps = + zebra_maps_open(res, reg_path, profilePath); + if (!reg->zebra_maps) { recTypes_destroy(reg->recTypes); bfs_destroy(reg->bfs); @@ -341,121 +392,135 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, xfree(reg); return 0; } - reg->rank_classes = NULL; - reg->key_buf = 0; - + reg->key_block = 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->sortIdx = 0; + reg->sort_index = 0; reg->isams = 0; reg->matchDict = 0; reg->isamc = 0; reg->isamb = 0; reg->zei = 0; - reg->key_file_no = 0; - reg->ptr_i = 0; - zebraRankInstall (reg, rank_1_class); - zebraRankInstall (reg, rank_zv_class); - zebraRankInstall (reg, rank_static_class); + /* installing rank classes */ + zebraRankInstall(reg, rank_1_class); + zebraRankInstall(reg, rank_similarity_class); + zebraRankInstall(reg, rank_static_class); - recordCompression = res_get_def (res, "recordCompression", "none"); - if (!strcmp (recordCompression, "none")) + recordCompression = res_get_def(res, "recordCompression", "none"); + if (!strcmp(recordCompression, "none")) record_compression = REC_COMPRESS_NONE; - if (!strcmp (recordCompression, "bzip2")) + if (!strcmp(recordCompression, "bzip2")) record_compression = REC_COMPRESS_BZIP2; - if (!(reg->records = rec_open (reg->bfs, rw, record_compression))) { - yaz_log (YLOG_WARN, "rec_open failed"); + 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; + } + } + + 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))) { - yaz_log (YLOG_WARN, "dict_open failed"); + 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 + { + 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, "sortIdx_open failed"); + 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)))) { - yaz_log (YLOG_WARN, "isams_open failed"); + 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 = isamc_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)))) { - yaz_log (YLOG_WARN, "isamc_open failed"); + 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))) { - yaz_log (YLOG_WARN, "isamb_open failed"); + 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))) { - yaz_log (YLOG_WARN, "isamb_open failed"); + 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))) { - yaz_log (YLOG_WARN, "isamb_open failed"); + yaz_log(YLOG_WARN, "isamb_open failed"); ret = ZEBRA_FAIL; } } - if (reg->records) + if (ret == ZEBRA_OK) { reg->zei = zebraExplain_open(reg->records, reg->dh, res, rw, reg, - explain_extract); + zebra_extract_explain); if (!reg->zei) { - yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information"); + yaz_log(YLOG_WARN, "Cannot obtain EXPLAIN information"); ret = ZEBRA_FAIL; } } @@ -465,29 +530,29 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, zebra_register_close(zs, reg); return 0; } - yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg); + yaz_log(YLOG_DEBUG, "zebra_register_open ok p=%p", reg); return reg; } -ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh) +ZEBRA_RES zebra_admin_shutdown(ZebraHandle zh) { - ASSERTZH; + 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); + zebra_mutex_cond_unlock(&zh->service->session_lock); return ZEBRA_OK; } -ZEBRA_RES zebra_admin_start (ZebraHandle zh) +ZEBRA_RES zebra_admin_start(ZebraHandle zh) { ZebraService zs; - ASSERTZH; + 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); + zebra_mutex_cond_lock(&zs->session_lock); + zebra_mutex_cond_unlock(&zs->session_lock); return ZEBRA_OK; } @@ -497,35 +562,31 @@ static void zebra_register_close(ZebraService zs, struct zebra_register *reg) assert(reg); yaz_log(YLOG_DEBUG, "zebra_register_close p=%p", reg); reg->stop_flag = 0; - zebra_chdir (zs); + zebra_chdir(zs); - zebraExplain_close (reg->zei); - dict_close (reg->dict); + zebraExplain_close(reg->zei); + dict_close(reg->dict); if (reg->matchDict) - dict_close (reg->matchDict); - sortIdx_close (reg->sortIdx); + dict_close(reg->matchDict); + zebra_sort_close(reg->sort_index); if (reg->isams) - isams_close (reg->isams); + isams_close(reg->isams); if (reg->isamc) - isamc_close (reg->isamc); + isamc_close(reg->isamc); if (reg->isamb) - isamb_close (reg->isamb); - rec_close (®->records); + 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); + 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); -#if NATTR zebra_rec_keys_close(reg->sortKeys); -#else - xfree(reg->sortKeys.buf); -#endif - xfree(reg->key_buf); + key_block_destroy(®->key_block); xfree(reg->name); xfree(reg); } @@ -534,44 +595,50 @@ ZEBRA_RES zebra_stop(ZebraService zs) { if (!zs) return ZEBRA_OK; - yaz_log (log_level, "zebra_stop"); - 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); + 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; } -ZEBRA_RES zebra_close (ZebraHandle zh) +ZEBRA_RES zebra_close(ZebraHandle zh) { ZebraService zs; struct zebra_session **sp; int i; yaz_log(log_level, "zebra_close"); - if (!zh) - return ZEBRA_OK; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); + zh->errCode = 0; zs = zh->service; - yaz_log (YLOG_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_close_res(zh); res_close(zh->session_res); xfree(zh->record_encoding); @@ -583,17 +650,17 @@ ZEBRA_RES zebra_close (ZebraHandle zh) 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; @@ -601,7 +668,7 @@ ZEBRA_RES zebra_close (ZebraHandle zh) } sp = &(*sp)->next; } - zebra_mutex_cond_unlock (&zs->session_lock); + zebra_mutex_cond_unlock(&zs->session_lock); xfree(zh->reg_name); xfree(zh->user_perm); zh->service = 0; /* more likely to trigger an assert */ @@ -643,80 +710,80 @@ static void zebra_open_res(ZebraHandle zh) } else { - yaz_log (YLOG_WARN, "no register root specified"); + yaz_log(YLOG_WARN, "no register root specified"); zh->res = 0; /* no path for register - fail! */ } } -static void zebra_close_res (ZebraHandle zh) +static void zebra_close_res(ZebraHandle zh) { ASSERTZH; zh->errCode = 0; - res_close (zh->res); + res_close(zh->res); zh->res = 0; } -static void 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) + 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); + 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); + zh->reg_name = xstrdup(new_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); + 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); } } 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); + 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); + zebra_lock_create(res_get(zh->res, "lockDir"), fname); if (!zh->lock_normal || !zh->lock_shadow) { @@ -743,12 +810,19 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg) { 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"); + } + 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); + } } } -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; @@ -759,14 +833,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++) @@ -774,7 +848,7 @@ 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; } @@ -795,8 +869,8 @@ int zebra_select_default_database(ZebraHandle zh) return 0; } -void map_basenames (ZebraHandle zh, ODR stream, - int *num_bases, char ***basenames) +void map_basenames(ZebraHandle zh, ODR stream, + int *num_bases, char ***basenames) { struct map_baseinfo info; struct map_baseinfo *p = &info; @@ -812,43 +886,45 @@ void map_basenames (ZebraHandle zh, ODR stream, 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->session_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++) - yaz_log (YLOG_DEBUG, "base %s", (*basenames)[i]); + yaz_log(YLOG_DEBUG, "base %s", (*basenames)[i]); } -ZEBRA_RES zebra_select_database (ZebraHandle zh, const char *basename) +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); + return zebra_select_databases(zh, 1, &basename); } -ZEBRA_RES 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_level, "zebra_select_databases n=%d [0]=%s", - num_bases,basenames[0]); + num_bases,basenames[0]); zh->errCode = 0; if (num_bases < 1) @@ -889,23 +965,23 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, zh->num_basenames = num_bases; 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); + memcpy(new_reg, basenames[0], len); new_reg[len] = '\0'; } else - new_reg = xstrdup (""); + new_reg = xstrdup(""); for (i = 1; ierrCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; return -1; @@ -929,7 +1005,7 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, } } } - zebra_select_register (zh, new_reg); + zebra_select_register(zh, new_reg); xfree(new_reg); if (!zh->res) { @@ -952,40 +1028,72 @@ ZEBRA_RES zebra_set_approx_limit(ZebraHandle zh, zint approx_limit) return ZEBRA_OK; } -ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, - const char *setname, zint *hits) +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; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); + assert(o); assert(query); assert(hits); assert(setname); yaz_log(log_level, "zebra_search_rpn"); - zh->hits = 0; - *hits = 0; + + 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); + zh->num_basenames, zh->basenames, setname, + hits, estimated_hit_count); + + *partial_resultset = zh->partial_result; zebra_end_read(zh); - *hits = zh->hits; return r; } +ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, + const char *setname, zint *hits) +{ + 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, - oid_value input_format, int num_recs, + const Odr_oid *input_format, int num_recs, ZebraRetrievalRecord *recs) { ZebraMetaRecord *poset; int i; ZEBRA_RES ret = ZEBRA_OK; zint *pos_array; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); assert(stream); assert(setname); assert(recs); @@ -1000,7 +1108,7 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, return ZEBRA_FAIL; } - if (zebra_begin_read (zh) == ZEBRA_FAIL) + if (zebra_begin_read(zh) == ZEBRA_FAIL) return ZEBRA_FAIL; pos_array = (zint *) xmalloc(num_recs * sizeof(*pos_array)); @@ -1009,7 +1117,7 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, poset = zebra_meta_records_create(zh, setname, num_recs, pos_array); if (!poset) { - yaz_log (YLOG_DEBUG, "zebraPosSetCreate error"); + yaz_log(YLOG_DEBUG, "zebraPosSetCreate error"); zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, setname); ret = ZEBRA_FAIL; @@ -1021,7 +1129,7 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, if (poset[i].term) { recs[i].errCode = 0; - recs[i].format = VAL_SUTRS; + recs[i].format = yaz_oid_recsyn_sutrs; recs[i].len = strlen(poset[i].term); recs[i].buf = poset[i].term; recs[i].base = poset[i].db; @@ -1029,15 +1137,18 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, else if (poset[i].sysno) { char *buf; - int len; + int len = 0; zebra_snippets *hit_snippet = zebra_snippets_create(); + /* we disable hit snippets for now. It does not work well + and it slows retrieval down a lot */ +#if 0 zebra_snippets_hit_vector(zh, setname, poset[i].sysno, hit_snippet); - +#endif recs[i].errCode = - zebra_record_fetch(zh, poset[i].sysno, poset[i].score, - hit_snippet, + zebra_record_fetch(zh, setname, + poset[i].sysno, poset[i].score, stream, input_format, comp, &recs[i].format, &buf, &len, &recs[i].base, &recs[i].errString); @@ -1068,13 +1179,13 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, recs[i].buf = 0; /* no record and no error issued */ recs[i].len = 0; recs[i].errCode = 0; - recs[i].format = VAL_NONE; + recs[i].format = 0; recs[i].sysno = 0; } } zebra_meta_records_destroy(zh, poset, num_recs); } - zebra_end_read (zh); + zebra_end_read(zh); xfree(pos_array); return ret; } @@ -1085,9 +1196,9 @@ ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query, int *is_partial, const char *setname) { - YAZ_PQF_Parser pqf_parser = yaz_pqf_create (); + YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); Z_AttributesPlusTerm *zapt; - int *attributeSet; + Odr_oid *attributeSet; ZEBRA_RES res; if (!(zapt = yaz_pqf_scan(pqf_parser, stream, &attributeSet, query))) @@ -1096,23 +1207,26 @@ ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query, zh->errCode = YAZ_BIB1_SCAN_MALFORMED_SCAN; } else - res = zebra_scan(zh, stream, zapt, VAL_BIB1, + { + res = zebra_scan(zh, stream, zapt, yaz_oid_attset_bib_1, position, num_entries, entries, is_partial, setname); - yaz_pqf_destroy (pqf_parser); + } + yaz_pqf_destroy(pqf_parser); return res; } ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, + const Odr_oid *attributeset, int *position, int *num_entries, ZebraScanEntry **entries, int *is_partial, const char *setname) { ZEBRA_RES res; - RSET limit_rset = 0; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); + assert(stream); assert(zapt); assert(position); @@ -1121,39 +1235,28 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, assert(entries); yaz_log(log_level, "zebra_scan"); - if (zebra_begin_read (zh) == ZEBRA_FAIL) + if (zebra_begin_read(zh) == ZEBRA_FAIL) { *entries = 0; *num_entries = 0; return ZEBRA_FAIL; } - if (setname) - { - limit_rset = resultSetRef(zh, setname); - if (!limit_rset) - { - zebra_setError(zh, - YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, - setname); - zebra_end_read (zh); - return ZEBRA_FAIL; - } - } - res = rpn_scan (zh, stream, zapt, attributeset, - zh->num_basenames, zh->basenames, position, - num_entries, entries, is_partial, limit_rset, 0); - zebra_end_read (zh); + + 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; } -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) +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) { ZEBRA_RES res; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); assert(stream); assert(num_input_setnames>0); assert(input_setnames); @@ -1175,8 +1278,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function, { int i, status; ASSERTZH; - assert(statuses); - yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames); + yaz_log(log_level, "zebra_deleteResultSet n=%d", num_setnames); if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; @@ -1185,13 +1287,13 @@ int zebra_deleteResultSet(ZebraHandle zh, int function, case Z_DeleteResultSetRequest_list: assert(num_setnames>0); assert(setnames); - resultSetDestroy (zh, num_setnames, setnames, statuses); + 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); + 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 = 0; if (zh) @@ -1228,16 +1330,16 @@ char *zebra_errAdd (ZebraHandle zh) return a; } -ZEBRA_RES 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; + ZEBRA_CHECK_HANDLE(zh); - zs= zh->service; + zs = zh->service; sprintf(u, "perm.%.30s", user ? user : "anonymous"); p = res_get(zs->global_res, u); @@ -1255,35 +1357,34 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) if (zh->user_perm && strchr(zh->user_perm, 'a')) return ZEBRA_OK; - if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass)) + if (!zs->passwd_db || !passwd_db_auth(zs->passwd_db, user, pass)) return ZEBRA_OK; return ZEBRA_FAIL; } -ZEBRA_RES 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_level, "zebra_admin_import_begin db=%s rt=%s", - database, record_type); + database, record_type); 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) +ZEBRA_RES zebra_admin_import_end(ZebraHandle zh) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_import_end"); return zebra_end_trans(zh); } -ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) +ZEBRA_RES zebra_admin_import_segment(ZebraHandle zh, Z_Segment *segment) { ZEBRA_RES res = ZEBRA_OK; - SYSNO sysno; + zint sysno; int i; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_import_segment"); for (i = 0; inum_segmentRecords; i++) @@ -1298,13 +1399,14 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) Odr_oct *oct = fragment->u.notExternallyTagged; sysno = 0; - if (zebra_update_record(zh, - 0, /* record Type */ - &sysno, - 0, /* match */ - 0, /* fname */ - (const char *) oct->buf, oct->len, - 0) == ZEBRA_FAIL) + 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; } } @@ -1312,93 +1414,6 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) 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) - /* 1 = insert. Fail it already exists */ - /* 2 = replace. Fail it does not exist */ - /* 3 = delete. Fail if does not exist */ - /* 4 = update. Insert/replace */ -{ - ZEBRA_RES res; - SYSNO sysno = 0; - char *rinfo = 0; - char recid_z[256]; - int db_ord; - ASSERTZH; - assert(action>0 && action <=4); - assert(rec_buf); - - yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action); - - if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) - { - zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, - "no record ID or empty record ID"); - return ZEBRA_FAIL; - } - - memcpy (recid_z, recid_buf, recid_len); - recid_z[recid_len] = 0; - - if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) - return ZEBRA_FAIL; - - 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); - zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, - "Cannot insert record: already exist"); - return ZEBRA_FAIL; - } - - memcpy (&sysno, rinfo+1, sizeof(sysno)); - } - else - { - if (action == 2 || action == 3) /* fail if delete or update */ - { - zebra_end_trans(zh); - zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, - "Cannot delete/update record: does not exist"); - return ZEBRA_FAIL; - } - action = 1; /* make it an insert (if it's an update).. */ - } - res = 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 (res == ZEBRA_FAIL) - { - zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, - "Unable to parse record"); - } - if (action == 1) - { - dict_insert_ord(zh->reg->matchDict, db_ord, recid_z, - sizeof(sysno), &sysno); - } - else if (action == 3) - { - dict_delete_ord(zh->reg->matchDict, db_ord, recid_z); - } - zebra_end_trans(zh); - return res; -} - int delete_w_handle(const char *info, void *handle) { ZebraHandle zh = (ZebraHandle) handle; @@ -1407,7 +1422,7 @@ int delete_w_handle(const char *info, void *handle) if (*info == sizeof(pos)) { - memcpy (&pos, info+1, sizeof(pos)); + memcpy(&pos, info+1, sizeof(pos)); isamb_unlink(zh->reg->isamb, pos); } return 0; @@ -1419,10 +1434,10 @@ static int delete_SU_handle(void *handle, int ord) char ord_buf[20]; int ord_len; - ord_len = key_SU_encode (ord, ord_buf); + ord_len = key_SU_encode(ord, ord_buf); ord_buf[ord_len] = '\0'; - assert (zh->reg->isamb); + assert(zh->reg->isamb); dict_delete_subtree(zh->reg->dict, ord_buf, zh, delete_w_handle); return 0; @@ -1431,22 +1446,31 @@ static int delete_SU_handle(void *handle, int ord) 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) + if (zebra_select_database(zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; - if (zebra_begin_trans (zh, 1) == ZEBRA_FAIL) + if (zebra_begin_trans(zh, 1) == 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); + 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 { @@ -1455,37 +1479,45 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) "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) +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 (zebra_select_database(zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; - if (zebra_begin_trans (zh, 1)) + if (zebra_begin_trans(zh, 1)) return ZEBRA_FAIL; /* announce database */ - if (zebraExplain_newDatabase (zh->reg->zei, db, 0 - /* explainDatabase */)) + 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; } - return zebra_end_trans (zh); + 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); @@ -1493,38 +1525,47 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, 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); } -static void zebra_set_state (ZebraHandle zh, int val, int 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_level, "zebra_set_state v=%d seq=%d", val, seqno); + 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"); + 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 (YLOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p); - fprintf (f, "%c %d %ld\n", val, seqno, p); - fclose (f); + 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); } -static void 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; @@ -1533,26 +1574,26 @@ static void zebra_get_state (ZebraHandle zh, char *val, int *seqno) ASSERTZH; 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"); + 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); + fscanf(f, "%c %d", val, seqno); + fclose(f); } xfree(fname); } -ZEBRA_RES zebra_begin_read (ZebraHandle zh) +ZEBRA_RES zebra_begin_read(ZebraHandle zh) { return zebra_begin_trans(zh, 0); } -ZEBRA_RES zebra_end_read (ZebraHandle zh) +ZEBRA_RES zebra_end_read(ZebraHandle zh) { return zebra_end_trans(zh); } @@ -1582,13 +1623,13 @@ 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); } ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); zebra_select_default_database(zh); if (!zh->res) { @@ -1611,10 +1652,9 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) } } - assert (zh->res); + assert(zh->res); if (rw) { - int pass; int seqno = 0; char val = '?'; const char *rval = 0; @@ -1633,7 +1673,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) } if (zh->reg) { - resultSetInvalidate (zh); + resultSetInvalidate(zh); zebra_register_close(zh->service, zh->reg); } zh->trans_w_no = zh->trans_no; @@ -1642,60 +1682,55 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) 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 (YLOG_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 (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"); - } + zebra_lock_w(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); } - break; - } - if (pass == 2) - { - yaz_log (YLOG_FATAL, "zebra_begin_trans couldn't finish commit"); - abort(); - return ZEBRA_FAIL; } - 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, @@ -1704,10 +1739,10 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) zh->reg->seqno = seqno; else { - zebra_set_state (zh, 'o', seqno); + 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; @@ -1729,11 +1764,10 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) 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); + times(&zh->tms1); #endif if (!zh->res) { @@ -1747,7 +1781,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) 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'; @@ -1755,27 +1789,27 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) dirty = 1; else if (seqno != zh->reg->seqno) { - yaz_log (YLOG_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 (YLOG_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 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); + resultSetInvalidate(zh); zebra_register_close(zh->service, zh->reg); } zh->reg = zebra_register_open(zh->service, zh->reg_name, @@ -1783,8 +1817,8 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) 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 = YAZ_BIB1_DATABASE_UNAVAILABLE; return ZEBRA_FAIL; @@ -1796,21 +1830,23 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) return ZEBRA_OK; } -ZEBRA_RES zebra_end_trans (ZebraHandle zh) +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); } -ZEBRA_RES 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_level, "zebra_end_transaction"); @@ -1835,57 +1871,55 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) /* 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 (YLOG_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); zh->reg = 0; - 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); + 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 = (int) zh->records_processed; - status->inserted = (int) zh->records_inserted; - status->updated = (int) zh->records_updated; - status->deleted = (int) 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 (YLOG_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); - 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)); + 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); @@ -1893,31 +1927,44 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) 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); - yaz_log (log_level, "updating %s", path); - repositoryUpdate (zh, path); - return 0; + return zebra_repository_index(zh, path, action_update); } -int zebra_repository_delete (ZebraHandle zh, const char *path) +ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path) +{ + return zebra_repository_index(zh, path, action_delete); +} + +ZEBRA_RES zebra_repository_index(ZebraHandle zh, const char *path, + enum zebra_recctrl_action_t action) { ASSERTZH; assert(path); - yaz_log (log_level, "deleting %s", path); - repositoryDelete (zh, path); - return 0; + + 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_level, "zebra_repository_show"); - repositoryShow (zh, path); - return 0; + repositoryShow(zh, path); + return ZEBRA_OK; } static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) @@ -1926,81 +1973,116 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) char val; const char *rval; BFiles bfs; + ZEBRA_RES res = ZEBRA_OK; + ASSERTZH; + yaz_log(log_level, "zebra_commit_ex clean_only=%d", clean_only); zebra_select_default_database(zh); if (!zh->res) { zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; return ZEBRA_FAIL; } - rval = res_get (zh->res, "shadow"); + rval = res_get(zh->res, "shadow"); if (!rval) { - yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined"); + 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); - yaz_log (YLOG_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"); } - yaz_log (YLOG_DEBUG, "commit clean"); - bf_commitClean (bfs, rval); - seqno++; - zebra_set_state (zh, 'o', seqno); } else { - yaz_log (log_level, "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 ZEBRA_OK; + return res; } 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_CHECK_HANDLE(zh); + zebra_select_default_database(zh); if (!zh->res) { @@ -2008,45 +2090,53 @@ ZEBRA_RES zebra_init(ZebraHandle zh) "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->res, "register"), zh->path_reg); + bfs = bfs_create(res_get(zh->res, "register"), zh->path_reg); if (!bfs) { 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); + bf_reset(bfs); + bfs_destroy(bfs); + zebra_set_state(zh, 'o', 0); return ZEBRA_OK; } ZEBRA_RES zebra_compact(ZebraHandle zh) { BFiles bfs; - ASSERTZH; + yaz_log(log_level, "zebra_compact"); + ZEBRA_CHECK_HANDLE(zh); if (!zh->res) { 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); + bfs = bfs_create(res_get(zh->res, "register"), zh->path_reg); + inv_compact(bfs); + bfs_destroy(bfs); return ZEBRA_OK; } 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) @@ -2058,9 +2148,9 @@ void zebra_shadow_enable(ZebraHandle zh, int 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_CHECK_HANDLE(zh); + assert(encoding); if (zh->iconv_to_utf8 != 0) yaz_iconv_close(zh->iconv_to_utf8); @@ -2068,34 +2158,34 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) yaz_iconv_close(zh->iconv_from_utf8); zh->iconv_to_utf8 = - yaz_iconv_open ("UTF-8", encoding); + yaz_iconv_open("UTF-8", encoding); if (zh->iconv_to_utf8 == 0) - yaz_log (YLOG_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 (YLOG_WARN, "iconv: UTF-8 to %s unsupported", encoding); + yaz_log(YLOG_WARN, "iconv: UTF-8 to %s unsupported", encoding); return ZEBRA_OK; } -ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding) +ZEBRA_RES zebra_record_encoding(ZebraHandle zh, const char *encoding) { - ASSERTZH; 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); + 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_level, "zebra_set_resource %s:%s", name, value); + ASSERTZH; res_set(zh->res, name, value); } @@ -2105,7 +2195,7 @@ const char *zebra_get_resource(ZebraHandle zh, const char *v; ASSERTZH; assert(name); - v = res_get_def (zh->res, name, (char *)defaultvalue); + v = res_get_def(zh->res, name,(char *)defaultvalue); yaz_log(log_level, "zebra_get_resource %s:%s", name, v); return v; } @@ -2113,145 +2203,77 @@ const char *zebra_get_resource(ZebraHandle zh, /* 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) { - ASSERTZH; yaz_log(log_level, "zebra_trans_no"); + ASSERTZH; return zh->trans_no; } -int zebra_get_shadow_enable (ZebraHandle zh) +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) +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; } -/* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve - so that it's identicical to the original api_records_retrieve */ -void api_records_retrieve (ZebraHandle zh, ODR stream, - const char *setname, Z_RecordComposition *comp, - oid_value input_format, int num_recs, - ZebraRetrievalRecord *recs) -{ - zebra_records_retrieve(zh, stream, setname, comp, input_format, - num_recs, recs); -} - -/* --------------------------------------------------------------------------- - 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) +ZEBRA_RES zebra_add_record(ZebraHandle zh, + const char *buf, int buf_size) { - return zebra_update_record(zh, 0, 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); } -ZEBRA_RES 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) { ZEBRA_RES res; - ASSERTZH; - assert(sysno); - assert(buf); - yaz_log(log_level, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno); - - if (buf_size < 1) - buf_size = strlen(buf); - if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) - return ZEBRA_FAIL; - 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; -} + ZEBRA_CHECK_HANDLE(zh); -ZEBRA_RES 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) -{ - ZEBRA_RES res; - ASSERTZH; assert(buf); 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 (buf_size < 1) + buf_size = strlen(buf); if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) return ZEBRA_FAIL; - 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); + res = zebra_buffer_extract_record(zh, buf, buf_size, + action, + 0, /* test_mode */ + recordType, + sysno, + match, + fname); + if (zebra_end_trans(zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + res = ZEBRA_FAIL; + } return res; } -ZEBRA_RES 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) -{ - ZEBRA_RES res; - ASSERTZH; - assert(sysno); - assert(buf); - yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno); - - if (buf_size < 1) buf_size = strlen(buf); - - if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) - return ZEBRA_FAIL; - 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 */ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query, @@ -2260,18 +2282,23 @@ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query, 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_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 (YLOG_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; } @@ -2289,22 +2316,23 @@ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query, } /* --------------------------------------------------------------------------- - 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); + sort_sequence = yaz_sort_spec(stream, sort_spec); yaz_log(log_level, "sort (FIXME) "); if (!sort_sequence) { @@ -2317,18 +2345,18 @@ int zebra_sort_by_specstr (ZebraHandle zh, ODR stream, 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) + Get BFS for Zebra system (to make alternative storage methods) */ struct BFiles_struct *zebra_get_bfs(ZebraHandle zh) { @@ -2339,11 +2367,11 @@ struct BFiles_struct *zebra_get_bfs(ZebraHandle zh) /* --------------------------------------------------------------------------- - Set limit for search/scan + Set limit for search/scan */ 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; @@ -2354,6 +2382,8 @@ ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids) */ 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; @@ -2369,12 +2399,20 @@ void zebra_setError_zint(ZebraHandle zh, int code, zint i) zh->errString = nmem_strdup(zh->nmem_error, vstr); } -void zebra_lock_prefix (Res res, char *path) +void zebra_lock_prefix(Res res, char *path) { - const char *lock_dir = res_get_def (res, "lockDir", ""); - - strcpy (path, lock_dir); + const char *lock_dir = res_get_def(res, "lockDir", ""); + + strcpy(path, lock_dir); if (*path && path[strlen(path)-1] != '/') - strcat (path, "/"); + strcat(path, "/"); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +