X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=2e64dd0e241bd470ad9f970ae66f4baa8c6bc572;hp=93c9ad9ce124ba303bee13aec3d1edef97b14d69;hb=3776ae570114d93706ff320ef573d202e908f98e;hpb=6988ba91e363565638c27a8d5895ad9afc409e75 diff --git a/index/zebraapi.c b/index/zebraapi.c index 93c9ad9..2e64dd0 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,8 +1,5 @@ -/* $Id: zebraapi.c,v 1.257 2007-08-21 11:06:47 adam Exp $ - Copyright (C) 1995-2007 - 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 @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -64,27 +64,31 @@ static ZEBRA_RES zebra_check_handle(ZebraHandle zh) #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_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); + 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 ZEBRA_RES zebra_flush_reg (ZebraHandle zh) +static ZEBRA_RES zebra_flush_reg(ZebraHandle zh) { ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_flush_reg"); - zebraExplain_flush (zh->reg->zei, zh); + zebraExplain_flush(zh->reg->zei, zh); key_block_flush(zh->reg->key_block, 1); @@ -121,7 +125,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 */ @@ -134,7 +138,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; @@ -156,24 +160,24 @@ ZebraHandle zebra_open(ZebraService zs, Res res) 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; @@ -192,6 +196,8 @@ ZebraService zebra_start(const char *configName) 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(); @@ -200,9 +206,14 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) log_level = yaz_log_module_level("zebraapi"); log_level_initialized = 1; } - - yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER, - configName ? 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))) { @@ -235,12 +246,16 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) zh->global_res = res; zh->sessions = 0; - zebra_chdir (zh); + if (zebra_chdir(zh)) + { + xfree(zh); + return 0; + } - 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; @@ -248,7 +263,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) @@ -269,9 +284,9 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) } zh->timing = yaz_timing_create(); - zh->path_root = res_get (zh->global_res, "root"); + 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) { @@ -286,7 +301,7 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) } 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); @@ -296,16 +311,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); @@ -322,9 +337,8 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, { 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; @@ -332,16 +346,16 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, 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_create(); if (!reg->dh) @@ -350,7 +364,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *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); @@ -360,7 +374,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); @@ -370,12 +384,11 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, } } - getcwd(cwd, sizeof(cwd)-1); 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, profilePath); @@ -405,108 +418,128 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, reg->zei = 0; /* installing rank classes */ - zebraRankInstall (reg, rank_1_class); - zebraRankInstall (reg, rank_similarity_class); - zebraRankInstall (reg, rank_static_class); + zebraRankInstall(reg, rank_1_class); + zebraRankInstall(reg, rank_2_class); + zebraRankInstall(reg, rank_similarity_class); + zebraRankInstall(reg, rank_static_class); - recordCompression = res_get_def (res, "recordCompression", "none"); - if (!strcmp (recordCompression, "none")) + 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 (!rec_check_compression_method(record_compression)) + { + yaz_log(YLOG_FATAL, "unsupported recordCompression: %s", + compression_str); + ret = ZEBRA_FAIL; + } - if (1) { const char *index_fname = res_get_def(res, "index", "default.idx"); - if (index_fname && *index_fname) + 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))) + if (!(reg->records = rec_open(reg->bfs, rw, record_compression))) { - yaz_log (YLOG_WARN, "rec_open failed"); + 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 (res_get_match (res, "sortindex", "f", "f")) + if (res_get_match(res, "sortindex", "f", "f")) sort_type = ZEBRA_SORT_TYPE_FLAT; - else if (res_get_match (res, "sortindex", "i", "f")) + 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 { - yaz_log (YLOG_WARN, "bad_value for 'sortindex'"); + 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"); + 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; } } @@ -517,7 +550,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, 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; } } @@ -527,29 +560,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) { 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; 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; } @@ -559,26 +592,26 @@ 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); + 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); zebra_rec_keys_close(reg->sortKeys); @@ -594,23 +627,23 @@ ZEBRA_RES zebra_stop(ZebraService zs) 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); + 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_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); @@ -630,12 +663,12 @@ ZEBRA_RES zebra_close(ZebraHandle 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); @@ -647,17 +680,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; @@ -665,7 +698,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 */ @@ -707,80 +740,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) { @@ -819,7 +852,7 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg) } } -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; @@ -830,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++) @@ -845,7 +878,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; } @@ -866,8 +899,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; @@ -883,34 +916,34 @@ 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) { 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; @@ -921,7 +954,7 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, 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) @@ -962,23 +995,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; @@ -1002,7 +1035,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) { @@ -1105,7 +1138,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)); @@ -1114,18 +1147,25 @@ 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; } else { - for (i = 0; i 0) { @@ -1160,7 +1203,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, else recs[i].buf = buf; recs[i].score = poset[i].score; - recs[i].sysno = poset[i].sysno; zebra_snippets_destroy(hit_snippet); } else @@ -1174,16 +1216,12 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, ret = ZEBRA_FAIL; break; } - recs[i].buf = 0; /* no record and no error issued */ - recs[i].len = 0; - recs[i].errCode = 0; - recs[i].format = 0; - recs[i].sysno = 0; } } zebra_meta_records_destroy(zh, poset, num_recs); + wrbuf_destroy(addinfo_w); } - zebra_end_read (zh); + zebra_end_read(zh); xfree(pos_array); return ret; } @@ -1194,7 +1232,7 @@ 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; Odr_oid *attributeSet; ZEBRA_RES res; @@ -1210,7 +1248,7 @@ ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query, position, num_entries, entries, is_partial, setname); } - yaz_pqf_destroy (pqf_parser); + yaz_pqf_destroy(pqf_parser); return res; } @@ -1222,7 +1260,6 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, const char *setname) { ZEBRA_RES res; - RSET limit_rset = 0; ZEBRA_CHECK_HANDLE(zh); @@ -1234,36 +1271,25 @@ 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); + 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; ZEBRA_CHECK_HANDLE(zh); @@ -1288,8 +1314,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; @@ -1298,13 +1323,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) @@ -1341,7 +1366,7 @@ 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; @@ -1368,29 +1393,29 @@ 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) { 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) { 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; zint sysno; @@ -1410,14 +1435,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, - action_update, - 0, /* record Type */ - &sysno, - 0, /* match */ - 0, /* fname */ - (const char *) oct->buf, oct->len) == 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; } } @@ -1429,28 +1454,61 @@ int delete_w_handle(const char *info, void *handle) { ZebraHandle zh = (ZebraHandle) handle; ISAM_P pos; - ASSERTZH; if (*info == sizeof(pos)) { - memcpy (&pos, info+1, sizeof(pos)); + memcpy(&pos, info+1, sizeof(pos)); isamb_unlink(zh->reg->isamb, pos); } return 0; } -static int delete_SU_handle(void *handle, int ord) +int delete_w_all_handle(const char *info, void *handle) +{ + ZebraHandle zh = (ZebraHandle) handle; + ISAM_P pos; + + if (*info == sizeof(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 delete_w_handle(info, handle); +} + +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; } @@ -1461,14 +1519,14 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) 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; - if (zebraExplain_curDatabase (zh->reg->zei, db)) + if (zebraExplain_curDatabase(zh->reg->zei, db)) { zebra_setError(zh, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, db); ret = ZEBRA_FAIL; @@ -1490,7 +1548,7 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) "drop database only supported for isam:b"); ret = ZEBRA_FAIL; } - if (zebra_end_trans (zh) != ZEBRA_OK) + if (zebra_end_trans(zh) != ZEBRA_OK) { yaz_log(YLOG_WARN, "zebra_end_trans failed"); ret = ZEBRA_FAIL; @@ -1498,36 +1556,37 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) return ret; } -ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db) +ZEBRA_RES zebra_create_database(ZebraHandle zh, const char *db) { 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 */)) { - if (zebra_end_trans (zh) != ZEBRA_OK) + 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, +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); @@ -1535,14 +1594,13 @@ 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); } @@ -1557,26 +1615,30 @@ int zebra_string_norm(ZebraHandle zh, unsigned reg_id, 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) +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); - - 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_level, "zebra_set_state v=%c seq=%d", val, seqno); - yaz_log (YLOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p); - fprintf (f, "%c %d %ld\n", val, seqno, p); - fclose (f); + 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); } -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; @@ -1585,26 +1647,30 @@ 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); + if (fscanf(f, "%c %d", val, seqno) != 2) + { + yaz_log(YLOG_ERRNO|YLOG_WARN, "fscan fail %s", + state_fname); + } + 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); } @@ -1663,7 +1729,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) } } - assert (zh->res); + assert(zh->res); if (rw) { int seqno = 0; @@ -1684,7 +1750,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; @@ -1696,11 +1762,11 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) 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"); if (rval) { @@ -1712,7 +1778,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) zebra_lock_w(zh->lock_normal); zebra_lock_w(zh->lock_shadow); } - zebra_get_state (zh, &val, &seqno); + zebra_get_state(zh, &val, &seqno); if (val != 'o') { /* either we didn't finish commit or shadow is dirty */ @@ -1721,9 +1787,9 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) yaz_log(YLOG_WARN, "previous transaction did not finish " "(shadow disabled)"); } - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); - if (zebra_commit (zh)) + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + if (zebra_commit(zh)) { zh->trans_no--; zh->trans_w_no = 0; @@ -1741,19 +1807,15 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) } } - 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); - if (zh->reg) - zh->reg->seqno = seqno; - else + if (!zh->reg) { - 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; @@ -1763,6 +1825,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) yaz_log(YLOG_FATAL, "%s", zh->errString); return ZEBRA_FAIL; } + zh->reg->seqno = seqno; zebraExplain_curDatabase(zh->reg->zei, zh->basenames[0]); } else @@ -1775,10 +1838,10 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) if (zh->trans_no != 1) { - return zebra_flush_reg (zh); + return zebra_flush_reg(zh); } #if HAVE_SYS_TIMES_H - times (&zh->tms1); + times(&zh->tms1); #endif if (!zh->res) { @@ -1792,7 +1855,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'; @@ -1800,27 +1863,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, @@ -1828,8 +1891,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; @@ -1841,7 +1904,7 @@ 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; @@ -1850,7 +1913,7 @@ ZEBRA_RES zebra_end_trans (ZebraHandle 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; @@ -1882,57 +1945,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 = 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); @@ -1942,22 +2003,33 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path) { - ASSERTZH; - assert(path); - yaz_log (log_level, "updating %s", path); - - 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); + 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); +} + +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); - return zebra_delete_from_path(zh, path); + + 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); } ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path) @@ -1965,7 +2037,7 @@ ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path) ASSERTZH; assert(path); yaz_log(log_level, "zebra_repository_show"); - repositoryShow (zh, path); + repositoryShow(zh, path); return ZEBRA_OK; } @@ -1979,6 +2051,7 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) ASSERTZH; + yaz_log(log_level, "zebra_commit_ex clean_only=%d", clean_only); zebra_select_default_database(zh); if (!zh->res) { @@ -1988,14 +2061,14 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) 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); - 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); @@ -2010,10 +2083,15 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) 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); @@ -2021,8 +2099,8 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) { zebra_set_state(zh, 'c', seqno); - yaz_log(YLOG_DEBUG, "commit start"); - if (bf_commitExec (bfs)) + yaz_log(log_level, "commit start"); + if (bf_commitExec(bfs)) res = ZEBRA_FAIL; } if (res == ZEBRA_OK) @@ -2086,20 +2164,20 @@ 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; } @@ -2114,12 +2192,306 @@ ZEBRA_RES zebra_compact(ZebraHandle zh) 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; } +#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)) + { + ; + } + 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; +} + +ZEBRA_RES zebra_register_check(ZebraHandle zh, const char *spec) +{ + 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; +} + void zebra_result(ZebraHandle zh, int *code, char **addinfo) { yaz_log(log_level, "zebra_result"); @@ -2154,25 +2526,25 @@ 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) { 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; } @@ -2191,7 +2563,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; } @@ -2199,21 +2571,21 @@ 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) { 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) { 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) { yaz_log(log_level, "zebra_set_shadow_enable %d",value); ASSERTZH; @@ -2255,7 +2627,6 @@ ZEBRA_RES zebra_update_record(ZebraHandle zh, return ZEBRA_FAIL; res = zebra_buffer_extract_record(zh, buf, buf_size, action, - 0, /* test_mode */ recordType, sysno, match, @@ -2269,7 +2640,7 @@ ZEBRA_RES zebra_update_record(ZebraHandle zh, } /* --------------------------------------------------------------------------- - Searching + Searching */ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query, @@ -2294,7 +2665,7 @@ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *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; } @@ -2312,12 +2683,12 @@ 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; @@ -2328,7 +2699,7 @@ int zebra_sort_by_specstr (ZebraHandle zh, ODR 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) { @@ -2341,18 +2712,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) { @@ -2363,7 +2734,7 @@ 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) { @@ -2397,16 +2768,17 @@ void zebra_setError_zint(ZebraHandle zh, int code, zint i) void zebra_lock_prefix(Res res, char *path) { - const char *lock_dir = res_get_def (res, "lockDir", ""); + 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 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab