X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=320d375ee362ff7546c7b20118e7f96818f58c08;hp=9a85e3285a377f634b559880f42e51507309e0be;hb=b8bc024e463e9498e6db70d36fc93dcc5673ba50;hpb=aa37dc73fac74b9d431987a02cc2f604af452fcc diff --git a/index/zebraapi.c b/index/zebraapi.c index 9a85e32..320d375 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.176 2005-06-10 10:55:18 adam Exp $ +/* $Id: zebraapi.c,v 1.213 2006-04-05 02:52:11 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -27,7 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#else +#endif +#if HAVE_UNISTD_H #include #endif @@ -35,9 +36,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include "index.h" +#include "orddict.h" #include #include +#define DEFAULT_APPROX_LIMIT 2000000000 + /* simple asserts to validate the most essential input args */ #define ASSERTZH assert(zh && zh->service) #define ASSERTZHRES assert(zh && zh->service && zh->res) @@ -46,8 +50,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA static int log_level = 0; static int log_level_initialized = 0; -static Res zebra_open_res (ZebraHandle zh); -static void zebra_close_res (ZebraHandle zh); +static void zebra_open_res(ZebraHandle zh); +static void zebra_close_res(ZebraHandle zh); + +static ZEBRA_RES zebra_check_handle(ZebraHandle zh) +{ + if (zh) + return ZEBRA_OK; + return ZEBRA_FAIL; +} + +#define ZEBRA_CHECK_HANDLE(zh) if (zebra_check_handle(zh) != ZEBRA_OK) return ZEBRA_FAIL static void zebra_chdir (ZebraService zs) { @@ -65,25 +78,25 @@ static void zebra_chdir (ZebraService zs) #endif } -static void zebra_flush_reg (ZebraHandle zh) +static ZEBRA_RES zebra_flush_reg (ZebraHandle zh) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_flush_reg"); - zebra_clearError(zh); zebraExplain_flush (zh->reg->zei, zh); extract_flushWriteKeys (zh, 1 /* final */); zebra_index_merge (zh ); + return ZEBRA_OK; } -static struct zebra_register *zebra_register_open (ZebraService zs, - const char *name, - int rw, int useshadow, - Res res, - const char *reg_path); -static void zebra_register_close (ZebraService zs, struct zebra_register *reg); +static struct zebra_register *zebra_register_open(ZebraService zs, + const char *name, + int rw, int useshadow, + Res res, + const char *reg_path); +static void zebra_register_close(ZebraService zs, struct zebra_register *reg); -ZebraHandle zebra_open (ZebraService zs) +ZebraHandle zebra_open(ZebraService zs, Res res) { ZebraHandle zh; const char *default_encoding; @@ -108,14 +121,16 @@ ZebraHandle zebra_open (ZebraService zs) zh->errCode = 0; zh->errString = 0; zh->res = 0; + zh->session_res = res_open(zs->global_res, res); zh->user_perm = 0; + zh->dbaccesslist = 0; zh->reg_name = xstrdup (""); zh->path_reg = 0; zh->num_basenames = 0; zh->basenames = 0; - zh->approx_limit = 1000000000; + zh->approx_limit = DEFAULT_APPROX_LIMIT; zh->trans_no = 0; zh->trans_w_no = 0; @@ -123,8 +138,9 @@ ZebraHandle zebra_open (ZebraService zs) zh->lock_shadow = 0; zh->shadow_enable = 1; + zh->m_staticrank = 0; - default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1"); + default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1"); zh->iconv_to_utf8 = yaz_iconv_open ("UTF-8", default_encoding); @@ -169,20 +185,28 @@ 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 : ""); - yaz_log(YLOG_LOG, "zebra_start %s %s",configName, ZEBRAVER); - assert(configName); - - if ((res = res_open (configName, def_res, over_res))) + if ((res = res_open(def_res, over_res))) { const char *passwd_plain = 0; const char *passwd_encrypt = 0; - ZebraService zh = xmalloc(sizeof(*zh)); + const char *dbaccess = 0; + ZebraService zh = 0; - yaz_log (YLOG_DEBUG, "Read resources `%s'", configName); - + if (configName) + { + ZEBRA_RES ret = res_read_file(res, configName); + if (ret != ZEBRA_OK) + { + res_close(res); + return 0; + } + } + zh = xmalloc(sizeof(*zh)); zh->global_res = res; - zh->configName = xstrdup(configName); zh->sessions = 0; zebra_chdir (zh); @@ -190,10 +214,11 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) zebra_mutex_cond_init (&zh->session_lock); passwd_plain = res_get (zh->global_res, "passwd"); passwd_encrypt = res_get (zh->global_res, "passwd.c"); + dbaccess = res_get (zh->global_res, "dbaccess"); if (!passwd_plain && !passwd_encrypt) zh->passwd_db = NULL; - else + else { zh->passwd_db = passwd_db_open(); if (!zh->passwd_db) @@ -206,6 +231,17 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) passwd_db_file_crypt(zh->passwd_db, passwd_encrypt); } } + + if (!dbaccess) + zh->dbaccess = NULL; + else { + zh->dbaccess = res_open(NULL, NULL); + if (res_read_file(zh->dbaccess, dbaccess) != ZEBRA_OK) { + yaz_log(YLOG_FATAL, "Failed to read %s", dbaccess); + return NULL; + } + } + zh->path_root = res_get (zh->global_res, "root"); zh->nmem = nmem_create(); zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem); @@ -234,32 +270,27 @@ Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw, { int page_size = 4096; char resource_str[200]; - const char *v; sprintf (resource_str, "dict.%.100s.pagesize", name); assert(bfs); assert(name); - v = res_get(res, resource_str); - if (v) - { - page_size = atoi(v); + if (res_get_int(res, resource_str, &page_size) == ZEBRA_OK) yaz_log(YLOG_LOG, "Using custom dictionary page size %d for %s", page_size, name); - } return dict_open(bfs, name, cache, rw, compact_flag, page_size); } - static -struct zebra_register *zebra_register_open (ZebraService zs, const char *name, - int rw, int useshadow, Res res, - const char *reg_path) +struct zebra_register *zebra_register_open(ZebraService zs, const char *name, + int rw, int useshadow, Res res, + const char *reg_path) { struct zebra_register *reg; int record_compression = REC_COMPRESS_NONE; const char *recordCompression = 0; const char *profilePath; char cwd[1024]; + ZEBRA_RES ret = ZEBRA_OK; ASSERTZS; @@ -276,9 +307,10 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, 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; } @@ -286,6 +318,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!reg->bfs) { data1_destroy(reg->dh); + xfree(reg->name); xfree(reg); return 0; } @@ -295,6 +328,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, { bfs_destroy(reg->bfs); data1_destroy(reg->dh); + xfree(reg->name); xfree(reg); return 0; } @@ -308,17 +342,29 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, data1_set_tabroot (reg->dh, reg_path); reg->recTypes = recTypes_init (zs->record_classes, reg->dh); - reg->zebra_maps = zebra_maps_open (res, reg_path); + reg->zebra_maps = + zebra_maps_open(res, reg_path, profilePath); + if (!reg->zebra_maps) + { + recTypes_destroy(reg->recTypes); + bfs_destroy(reg->bfs); + data1_destroy(reg->dh); + xfree(reg->name); + xfree(reg); + return 0; + } reg->rank_classes = NULL; reg->key_buf = 0; - reg->keys.buf_max = 0; - reg->keys.buf = 0; - reg->keys.codec_handle = iscz1_start(); + 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; @@ -328,12 +374,12 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, reg->isamc = 0; reg->isamb = 0; reg->zei = 0; - reg->matchDict = 0; reg->key_file_no = 0; reg->ptr_i = 0; - zebraRankInstall (reg, rank1_class); - zebraRankInstall (reg, rankzv_class); + zebraRankInstall (reg, rank_1_class); + zebraRankInstall (reg, rank_zv_class); + zebraRankInstall (reg, rank_static_class); recordCompression = res_get_def (res, "recordCompression", "none"); if (!strcmp (recordCompression, "none")) @@ -341,10 +387,20 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!strcmp (recordCompression, "bzip2")) record_compression = REC_COMPRESS_BZIP2; + if (1) + { + const char *index_fname = res_get_def(res, "index", "default.idx"); + if (index_fname && *index_fname) + { + if (zebra_maps_read_file(reg->zebra_maps, index_fname) != ZEBRA_OK) + ret = ZEBRA_FAIL; + } + } + if (!(reg->records = rec_open (reg->bfs, rw, record_compression))) { yaz_log (YLOG_WARN, "rec_open failed"); - return 0; + ret = ZEBRA_FAIL; } if (rw) { @@ -353,12 +409,12 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res))) { yaz_log (YLOG_WARN, "dict_open failed"); - return 0; + ret = ZEBRA_FAIL; } if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw))) { yaz_log (YLOG_WARN, "sortIdx_open failed"); - return 0; + ret = ZEBRA_FAIL; } if (res_get_match (res, "isam", "s", ISAM_DEFAULT)) { @@ -367,7 +423,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, key_isams_m(res, &isams_m)))) { yaz_log (YLOG_WARN, "isams_open failed"); - return 0; + ret = ZEBRA_FAIL; } } if (res_get_match (res, "isam", "c", ISAM_DEFAULT)) @@ -377,7 +433,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, rw, key_isamc_m(res, &isamc_m)))) { yaz_log (YLOG_WARN, "isamc_open failed"); - return 0; + ret = ZEBRA_FAIL; } } if (res_get_match (res, "isam", "b", ISAM_DEFAULT)) @@ -388,7 +444,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, rw, key_isamc_m(res, &isamc_m), 0))) { yaz_log (YLOG_WARN, "isamb_open failed"); - return 0; + ret = ZEBRA_FAIL; } } if (res_get_match (res, "isam", "bc", ISAM_DEFAULT)) @@ -399,7 +455,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, rw, key_isamc_m(res, &isamc_m), 1))) { yaz_log (YLOG_WARN, "isamb_open failed"); - return 0; + ret = ZEBRA_FAIL; } } if (res_get_match (res, "isam", "null", ISAM_DEFAULT)) @@ -410,27 +466,34 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, rw, key_isamc_m(res, &isamc_m), -1))) { yaz_log (YLOG_WARN, "isamb_open failed"); - return 0; + ret = ZEBRA_FAIL; + } + } + if (ret == ZEBRA_OK) + { + reg->zei = zebraExplain_open(reg->records, reg->dh, + res, rw, reg, + explain_extract); + if (!reg->zei) + { + yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information"); + ret = ZEBRA_FAIL; } } - reg->zei = zebraExplain_open (reg->records, reg->dh, - res, rw, reg, - explain_extract); - if (!reg->zei) + + if (ret != ZEBRA_OK) { - yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information"); + zebra_register_close(zs, reg); return 0; } - reg->active = 2; yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg); return reg; } ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_shutdown"); - zebra_clearError(zh); zebra_mutex_cond_lock (&zh->service->session_lock); zh->service->stop_flag = 1; @@ -441,37 +504,34 @@ ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh) ZEBRA_RES zebra_admin_start (ZebraHandle zh) { ZebraService zs; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_start"); - zebra_clearError(zh); zs = zh->service; zebra_mutex_cond_lock (&zs->session_lock); zebra_mutex_cond_unlock (&zs->session_lock); return ZEBRA_OK; } -static void zebra_register_close (ZebraService zs, struct zebra_register *reg) +static void zebra_register_close(ZebraService zs, struct zebra_register *reg) { ASSERTZS; assert(reg); yaz_log(YLOG_DEBUG, "zebra_register_close p=%p", reg); reg->stop_flag = 0; zebra_chdir (zs); - if (reg->records) - { - zebraExplain_close (reg->zei); - dict_close (reg->dict); - if (reg->matchDict) - dict_close (reg->matchDict); - sortIdx_close (reg->sortIdx); - if (reg->isams) - isams_close (reg->isams); - if (reg->isamc) - isamc_close (reg->isamc); - if (reg->isamb) - isamb_close (reg->isamb); - rec_close (®->records); - } + + zebraExplain_close (reg->zei); + dict_close (reg->dict); + if (reg->matchDict) + dict_close (reg->matchDict); + sortIdx_close (reg->sortIdx); + if (reg->isams) + isams_close (reg->isams); + if (reg->isamc) + isamc_close (reg->isamc); + if (reg->isamb) + isamb_close (reg->isamb); + rec_close (®->records); recTypes_destroy (reg->recTypes); zebra_maps_close (reg->zebra_maps); @@ -479,10 +539,13 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *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); - xfree(reg->keys.buf); - if (reg->keys.codec_handle) - iscz1_stop(reg->keys.codec_handle); +#endif + xfree(reg->key_buf); xfree(reg->name); xfree(reg); @@ -507,7 +570,6 @@ ZEBRA_RES zebra_stop(ZebraService zs) recTypeClass_destroy(zs->record_classes); nmem_destroy(zs->nmem); res_close (zs->global_res); - xfree(zs->configName); xfree(zs); return ZEBRA_OK; } @@ -519,9 +581,8 @@ ZEBRA_RES zebra_close (ZebraHandle zh) int i; yaz_log(log_level, "zebra_close"); - if (!zh) - return ZEBRA_OK; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); + zh->errCode = 0; zs = zh->service; @@ -529,11 +590,14 @@ ZEBRA_RES zebra_close (ZebraHandle zh) resultSetDestroy (zh, -1, 0, 0); if (zh->reg) - zebra_register_close (zh->service, zh->reg); + zebra_register_close(zh->service, zh->reg); zebra_close_res (zh); + res_close(zh->session_res); xfree(zh->record_encoding); + xfree(zh->dbaccesslist); + for (i = 0; i < zh->num_basenames; i++) xfree(zh->basenames[i]); xfree(zh->basenames); @@ -581,38 +645,34 @@ struct map_baseinfo { int new_num_max; }; -static Res zebra_open_res (ZebraHandle zh) +static void zebra_open_res(ZebraHandle zh) { - Res res = 0; char fname[512]; ASSERTZH; zh->errCode = 0; if (zh->path_reg) { - sprintf (fname, "%.200s/zebra.cfg", zh->path_reg); - res = res_open (fname, zh->service->global_res, 0); - if (!res) - res = zh->service->global_res; + sprintf(fname, "%.200s/zebra.cfg", zh->path_reg); + zh->res = res_open(zh->session_res, 0); + res_read_file(zh->res, fname); } else if (*zh->reg_name == 0) { - res = zh->service->global_res; + zh->res = res_open(zh->session_res, 0); } else { yaz_log (YLOG_WARN, "no register root specified"); - return 0; /* no path for register - fail! */ + zh->res = 0; /* no path for register - fail! */ } - return res; } static void zebra_close_res (ZebraHandle zh) { ASSERTZH; zh->errCode = 0; - if (zh->res != zh->service->global_res) - res_close (zh->res); + res_close (zh->res); zh->res = 0; } @@ -632,7 +692,7 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg) if (zh->reg) { resultSetInvalidate (zh); - zebra_register_close (zh->service, zh->reg); + zebra_register_close(zh->service, zh->reg); zh->reg = 0; } zebra_close_res(zh); @@ -653,7 +713,7 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg) strcat (zh->path_reg, zh->reg_name); } } - zh->res = zebra_open_res (zh); + zebra_open_res(zh); if (zh->lock_normal) zebra_lock_destroy (zh->lock_normal); @@ -666,17 +726,17 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg) 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); zh->lock_normal = - zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0); + zebra_lock_create (res_get(zh->res, "lockDir"), fname); sprintf (fname, "shadow.%s.LCK", zh->reg_name); zh->lock_shadow = - zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0); + zebra_lock_create (res_get(zh->res, "lockDir"), fname); if (!zh->lock_normal || !zh->lock_shadow) { @@ -693,6 +753,17 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg) zebra_close_res(zh); } } + if (zh->res) + { + int approx = 0; + if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK) + zebra_set_approx_limit(zh, approx); + } + if (zh->res) + { + if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK) + yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank); + } } void map_basenames_func (void *vp, const char *name, const char *value) @@ -734,8 +805,8 @@ int zebra_select_default_database(ZebraHandle zh) /* no database has been selected - so we select based on resource setting (including group) */ - const char *group = res_get(zh->service->global_res, "group"); - const char *v = res_get_prefix(zh->service->global_res, + const char *group = res_get(zh->session_res, "group"); + const char *v = res_get_prefix(zh->session_res, "database", group, "Default"); return zebra_select_database(zh, v); } @@ -762,7 +833,7 @@ void map_basenames (ZebraHandle zh, ODR stream, odr_malloc (stream, sizeof(*info.new_basenames) * info.new_num_max); info.mem = stream->mem; - res_trav (zh->service->global_res, "mapdb", &info, map_basenames_func); + res_trav (zh->session_res, "mapdb", &info, map_basenames_func); for (i = 0; inum_bases; i++) if (p->basenames[i] && p->new_num_bases < p->new_num_max) @@ -778,7 +849,8 @@ void map_basenames (ZebraHandle zh, ODR stream, 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); @@ -791,7 +863,8 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, 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", @@ -803,6 +876,32 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; return ZEBRA_FAIL; } + + /* Check if the user has access to all databases (Seb) */ + /* You could argue that this should happen later, after we have + * determined that the database(s) exist. */ + if (zh->dbaccesslist) { + for (i = 0; i < num_bases; i++) { + const char *db = basenames[i]; + char *p, *pp; + for (p = zh->dbaccesslist; p && *p; p = pp) { + int len; + if ((pp = strchr(p, '+'))) { + len = pp - p; + pp++; + } + else + len = strlen(p); + if (len == strlen(db) && !strncmp(db, p, len)) + break; + } + if (!p) { + zh->errCode = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED; + return ZEBRA_FAIL; + } + } + } + for (i = 0; i < zh->num_basenames; i++) xfree(zh->basenames[i]); xfree(zh->basenames); @@ -868,7 +967,7 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, ZEBRA_RES zebra_set_approx_limit(ZebraHandle zh, zint approx_limit) { if (approx_limit == 0) - approx_limit = 2000000000; + approx_limit = DEFAULT_APPROX_LIMIT; zh->approx_limit = approx_limit; return ZEBRA_OK; } @@ -877,13 +976,14 @@ ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, const char *setname, zint *hits) { ZEBRA_RES r; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); + assert(o); assert(query); assert(hits); assert(setname); yaz_log(log_level, "zebra_search_rpn"); - zebra_clearError(zh); zh->hits = 0; *hits = 0; @@ -907,7 +1007,8 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, int i; ZEBRA_RES ret = ZEBRA_OK; zint *pos_array; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); assert(stream); assert(setname); assert(recs); @@ -915,7 +1016,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs); - zebra_clearError(zh); if (!zh->res) { zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, @@ -979,12 +1079,20 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, } else { - if (ret == ZEBRA_OK) /* only need to set it once */ + /* only need to set it once */ + if (pos_array[i] < zh->approx_limit && ret == ZEBRA_OK) + { zebra_setError_zint(zh, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, pos_array[i]); - ret = ZEBRA_FAIL; - break; + 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 = VAL_NONE; + recs[i].sysno = 0; } } zebra_meta_records_destroy(zh, poset, num_recs); @@ -997,7 +1105,8 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query, int *position, int *num_entries, ZebraScanEntry **entries, - int *is_partial) + int *is_partial, + const char *setname) { YAZ_PQF_Parser pqf_parser = yaz_pqf_create (); Z_AttributesPlusTerm *zapt; @@ -1011,7 +1120,8 @@ ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query, } else res = zebra_scan(zh, stream, zapt, VAL_BIB1, - position, num_entries, entries, is_partial); + position, num_entries, entries, is_partial, + setname); yaz_pqf_destroy (pqf_parser); return res; } @@ -1020,10 +1130,14 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, oid_value attributeset, int *position, int *num_entries, ZebraScanEntry **entries, - int *is_partial) + int *is_partial, + const char *setname) { ZEBRA_RES res; - ASSERTZH; + RSET limit_rset = 0; + + ZEBRA_CHECK_HANDLE(zh); + assert(stream); assert(zapt); assert(position); @@ -1031,16 +1145,28 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, assert(is_partial); assert(entries); yaz_log(log_level, "zebra_scan"); - zebra_clearError(zh); + 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, 0, 0); + num_entries, entries, is_partial, limit_rset, 0); zebra_end_read (zh); return res; } @@ -1052,14 +1178,14 @@ ZEBRA_RES zebra_sort (ZebraHandle zh, ODR stream, int *sort_status) { ZEBRA_RES res; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); assert(stream); assert(num_input_setnames>0); assert(input_setnames); assert(sort_sequence); assert(sort_status); yaz_log(log_level, "zebra_sort"); - zebra_clearError(zh); + if (zebra_begin_read(zh) == ZEBRA_FAIL) return ZEBRA_FAIL; res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames, @@ -1076,7 +1202,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function, ASSERTZH; assert(statuses); yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames); - zebra_clearError(zh);; + if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; switch (function) @@ -1127,30 +1253,29 @@ char *zebra_errAdd (ZebraHandle zh) return a; } -void zebra_clearError(ZebraHandle zh) -{ - if (zh) - { - zh->errCode = 0; - zh->errString = 0; - } -} - ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) { const char *p; + const char *astring; char u[40]; ZebraService zs; - ASSERTZH; - zebra_clearError(zh); - zs= zh->service; + ZEBRA_CHECK_HANDLE(zh); + + zs = zh->service; sprintf(u, "perm.%.30s", user ? user : "anonymous"); p = res_get(zs->global_res, u); xfree(zh->user_perm); zh->user_perm = xstrdup(p ? p : "r"); + /* Determine database access list */ + astring = res_get(zs->dbaccess, user ? user : "anonymous"); + if (astring) + zh->dbaccesslist = xstrdup(astring); + else + zh->dbaccesslist = 0; + /* users that don't require a password .. */ if (zh->user_perm && strchr(zh->user_perm, 'a')) return ZEBRA_OK; @@ -1163,10 +1288,8 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database, const char *record_type) { - ASSERTZH; yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", database, record_type); - zebra_clearError(zh); if (zebra_select_database(zh, database) == ZEBRA_FAIL) return ZEBRA_FAIL; return zebra_begin_trans(zh, 1); @@ -1174,9 +1297,8 @@ ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database, ZEBRA_RES zebra_admin_import_end (ZebraHandle zh) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_import_end"); - zebra_clearError(zh); return zebra_end_trans(zh); } @@ -1185,9 +1307,9 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) ZEBRA_RES res = ZEBRA_OK; SYSNO sysno; int i; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_import_segment"); - zebra_clearError(zh); + for (i = 0; inum_segmentRecords; i++) { Z_NamePlusRecord *npr = segment->segmentRecords[i]; @@ -1200,13 +1322,13 @@ 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 */ - oct->buf, oct->len, - 0) == ZEBRA_FAIL) + if (zebra_update_record(zh, + 0, /* record Type */ + &sysno, + 0, /* match */ + 0, /* fname */ + (const char *) oct->buf, oct->len, + 0) == ZEBRA_FAIL) res = ZEBRA_FAIL; } } @@ -1214,11 +1336,11 @@ 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) +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 */ @@ -1228,15 +1350,19 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, SYSNO sysno = 0; char *rinfo = 0; char recid_z[256]; - ASSERTZH; + int db_ord; + ZEBRA_CHECK_HANDLE(zh); assert(action>0 && action <=4); assert(rec_buf); yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action); - zebra_clearError(zh); if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) + { + 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; @@ -1244,13 +1370,17 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) return ZEBRA_FAIL; - rinfo = dict_lookup (zh->reg->matchDict, recid_z); + db_ord = zebraExplain_get_database_ord(zh->reg->zei); + rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, recid_z); if (rinfo) { if (action == 1) /* fail if insert */ { - zebra_end_trans(zh); - return ZEBRA_FAIL; + if (zebra_end_trans(zh) != ZEBRA_OK) + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "Cannot insert record: already exist"); + return ZEBRA_FAIL; } memcpy (&sysno, rinfo+1, sizeof(sysno)); @@ -1259,7 +1389,10 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, { if (action == 2 || action == 3) /* fail if delete or update */ { - zebra_end_trans(zh); + if (zebra_end_trans(zh) != ZEBRA_OK) + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "Cannot delete/update record: does not exist"); return ZEBRA_FAIL; } action = 1; /* make it an insert (if it's an update).. */ @@ -1271,18 +1404,28 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, &sysno, 0, /* match */ 0, /* fname */ - 0, /* force update */ + 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 (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno); + dict_insert_ord(zh->reg->matchDict, db_ord, recid_z, + sizeof(sysno), &sysno); } else if (action == 3) { - dict_delete (zh->reg->matchDict, recid_z); + dict_delete_ord(zh->reg->matchDict, db_ord, recid_z); + } + if (zebra_end_trans(zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + res = ZEBRA_FAIL; } - zebra_end_trans(zh); return res; } @@ -1318,9 +1461,9 @@ 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_clearError(zh); + ZEBRA_CHECK_HANDLE(zh); if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; @@ -1328,26 +1471,34 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) 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); } else { yaz_log(YLOG_WARN, "drop database only supported for isam:b"); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "drop database only supported for isam:b"); + ret = ZEBRA_FAIL; + } + if (zebra_end_trans (zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); ret = ZEBRA_FAIL; } - zebra_end_trans (zh); return ret; } 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); - zebra_clearError(zh); if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; @@ -1358,7 +1509,10 @@ ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db) 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; } @@ -1374,7 +1528,7 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, assert(input_str); assert(output_str); yaz_log(log_level, "zebra_string_norm "); - zebra_clearError(zh); + if (!zh->reg->zebra_maps) return -1; wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "", @@ -1397,7 +1551,6 @@ static void zebra_set_state (ZebraHandle zh, int val, int seqno) FILE *f; ASSERTZH; yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno); - zebra_clearError(zh); sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); @@ -1417,7 +1570,7 @@ static void zebra_get_state (ZebraHandle zh, char *val, int *seqno) ASSERTZH; yaz_log(log_level, "zebra_get_state "); - zebra_clearError(zh); + sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); f = fopen (fname, "r"); @@ -1473,7 +1626,7 @@ static void read_res_for_transaction(ZebraHandle zh) ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); zebra_select_default_database(zh); if (!zh->res) { @@ -1519,12 +1672,10 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) if (zh->reg) { resultSetInvalidate (zh); - zebra_register_close (zh->service, zh->reg); + zebra_register_close(zh->service, zh->reg); } zh->trans_w_no = zh->trans_no; - zebra_clearError(zh); - zh->records_inserted = 0; zh->records_updated = 0; zh->records_deleted = 0; @@ -1568,7 +1719,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) 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"); @@ -1584,9 +1735,9 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) } zebra_set_state (zh, 'd', seqno); - zh->reg = zebra_register_open (zh->service, zh->reg_name, - 1, rval ? 1 : 0, zh->res, - zh->path_reg); + zh->reg = zebra_register_open(zh->service, zh->reg_name, + 1, rval ? 1 : 0, zh->res, + zh->path_reg); if (zh->reg) zh->reg->seqno = seqno; else @@ -1604,6 +1755,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) yaz_log(YLOG_FATAL, "%s", zh->errString); return ZEBRA_FAIL; } + zebraExplain_curDatabase(zh->reg->zei, zh->basenames[0]); } else { @@ -1615,10 +1767,8 @@ 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); } - zebra_clearError(zh); #if HAVE_SYS_TIMES_H times (&zh->tms1); #endif @@ -1663,11 +1813,11 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) if (zh->reg) { resultSetInvalidate (zh); - zebra_register_close (zh->service, zh->reg); + zebra_register_close(zh->service, zh->reg); } - zh->reg = zebra_register_open (zh->service, zh->reg_name, - 0, val == 'c' ? 1 : 0, - zh->res, zh->path_reg); + zh->reg = zebra_register_open(zh->service, zh->reg_name, + 0, val == 'c' ? 1 : 0, + zh->res, zh->path_reg); if (!zh->reg) { zebra_unlock (zh->lock_normal); @@ -1686,8 +1836,9 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) 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); } @@ -1697,7 +1848,8 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) int seqno; const char *rval; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); + assert(status); yaz_log(log_level, "zebra_end_transaction"); @@ -1739,7 +1891,7 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) resultSetInvalidate (zh); - zebra_register_close (zh->service, zh->reg); + zebra_register_close(zh->service, zh->reg); zh->reg = 0; yaz_log (YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d " @@ -1784,20 +1936,18 @@ int zebra_repository_update (ZebraHandle zh, const char *path) { ASSERTZH; assert(path); - zebra_clearError(zh); yaz_log (log_level, "updating %s", path); repositoryUpdate (zh, path); - return zh->errCode; + return 0; } int zebra_repository_delete (ZebraHandle zh, const char *path) { ASSERTZH; assert(path); - zebra_clearError(zh); yaz_log (log_level, "deleting %s", path); repositoryDelete (zh, path); - return zh->errCode; + return 0; } int zebra_repository_show (ZebraHandle zh, const char *path) @@ -1805,38 +1955,41 @@ int zebra_repository_show (ZebraHandle zh, const char *path) ASSERTZH; assert(path); yaz_log(log_level, "zebra_repository_show"); - zebra_clearError(zh); repositoryShow (zh, path); - return zh->errCode; + return 0; } -static int zebra_commit_ex(ZebraHandle zh, int clean_only) +static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) { int seqno; char val; const char *rval; BFiles bfs; ASSERTZH; - zebra_clearError(zh); zebra_select_default_database(zh); if (!zh->res) { zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; - return -1; + return ZEBRA_FAIL; } rval = res_get (zh->res, "shadow"); if (!rval) { yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined"); - return 0; + return ZEBRA_OK; } zebra_lock_w (zh->lock_normal); zebra_lock_r (zh->lock_shadow); bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg); - + if (!bfs) + { + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + return ZEBRA_FAIL; + } zebra_get_state (zh, &val, &seqno); if (rval && *rval) @@ -1855,43 +2008,50 @@ static int zebra_commit_ex(ZebraHandle zh, int clean_only) sync (); #endif } - yaz_log (YLOG_DEBUG, "commit clean"); - bf_commitClean (bfs, rval); seqno++; zebra_set_state (zh, 'o', seqno); + + zebra_unlock (zh->lock_shadow); + zebra_unlock (zh->lock_normal); + + zebra_lock_w(zh->lock_shadow); + bf_commitClean (bfs, rval); + zebra_unlock (zh->lock_normal); } else { + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); yaz_log (log_level, "nothing to commit"); } bfs_destroy (bfs); - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); - return 0; + return ZEBRA_OK; } ZEBRA_RES zebra_clean(ZebraHandle zh) { - ASSERTZH; yaz_log(log_level, "zebra_clean"); + ZEBRA_CHECK_HANDLE(zh); return zebra_commit_ex(zh, 1); } ZEBRA_RES zebra_commit(ZebraHandle zh) { - ASSERTZH; yaz_log(log_level, "zebra_commit"); + ZEBRA_CHECK_HANDLE(zh); return zebra_commit_ex(zh, 0); } + ZEBRA_RES zebra_init(ZebraHandle zh) { const char *rval; BFiles bfs = 0; - ASSERTZH; + yaz_log(log_level, "zebra_init"); - zebra_clearError(zh); + + ZEBRA_CHECK_HANDLE(zh); zebra_select_default_database(zh); if (!zh->res) @@ -1920,9 +2080,9 @@ ZEBRA_RES zebra_init(ZebraHandle zh) ZEBRA_RES zebra_compact(ZebraHandle zh) { BFiles bfs; - ASSERTZH; + yaz_log(log_level, "zebra_compact"); - zebra_clearError(zh); + ZEBRA_CHECK_HANDLE(zh); if (!zh->res) { zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; @@ -1936,26 +2096,31 @@ ZEBRA_RES zebra_compact(ZebraHandle zh) void zebra_result(ZebraHandle zh, int *code, char **addinfo) { - ASSERTZH; yaz_log(log_level, "zebra_result"); - *code = zh->errCode; - *addinfo = zh->errString; + if (zh) + { + *code = zh->errCode; + *addinfo = zh->errString; + } + else + { + *code = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR; + *addinfo ="ZebraHandle is NULL"; + } } void zebra_shadow_enable(ZebraHandle zh, int value) { ASSERTZH; yaz_log(log_level, "zebra_shadow_enable"); - zebra_clearError(zh); zh->shadow_enable = value; } ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) { - ASSERTZH; + yaz_log(log_level, "zebra_octet_term_encoding %s", encoding); + ZEBRA_CHECK_HANDLE(zh); assert(encoding); - yaz_log(log_level, "zebra_octet_term_encoding"); - zebra_clearError(zh); if (zh->iconv_to_utf8 != 0) yaz_iconv_close(zh->iconv_to_utf8); @@ -1976,9 +2141,8 @@ ZEBRA_RES zebra_octet_term_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_clearError(zh); + ZEBRA_CHECK_HANDLE(zh); xfree(zh->record_encoding); zh->record_encoding = 0; if (encoding) @@ -1988,11 +2152,10 @@ ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding) void zebra_set_resource(ZebraHandle zh, const char *name, const char *value) { - ASSERTZH; assert(name); assert(value); yaz_log(log_level, "zebra_set_resource %s:%s", name, value); - zebra_clearError(zh); + ASSERTZH; res_set(zh->res, name, value); } @@ -2002,9 +2165,7 @@ const char *zebra_get_resource(ZebraHandle zh, const char *v; ASSERTZH; assert(name); - assert(defaultvalue); v = res_get_def (zh->res, name, (char *)defaultvalue); - zebra_clearError(zh); yaz_log(log_level, "zebra_get_resource %s:%s", name, v); return v; } @@ -2014,22 +2175,22 @@ const char *zebra_get_resource(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) { - ASSERTZH; yaz_log(log_level, "zebra_get_shadow_enable"); + ASSERTZH; return zh->shadow_enable; } void zebra_set_shadow_enable (ZebraHandle zh, int value) { - ASSERTZH; yaz_log(log_level, "zebra_set_shadow_enable %d",value); + ASSERTZH; zh->shadow_enable = value; } @@ -2057,8 +2218,7 @@ NOTE: Now returns 0 at success and updates sysno, which is an int* int zebra_add_record(ZebraHandle zh, const char *buf, int buf_size) { - SYSNO sysno = 0; - return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0); + return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0); } ZEBRA_RES zebra_insert_record (ZebraHandle zh, @@ -2086,7 +2246,11 @@ ZEBRA_RES zebra_insert_record (ZebraHandle zh, match, fname, 0, 0); /* allow_update */ - zebra_end_trans(zh); + if (zebra_end_trans(zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + res = ZEBRA_FAIL; + } return res; } @@ -2098,11 +2262,14 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh, int force_update) { ZEBRA_RES res; - ASSERTZH; - assert(sysno); + + ZEBRA_CHECK_HANDLE(zh); + assert(buf); - yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, *sysno); + 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); @@ -2116,7 +2283,11 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh, match, fname, force_update, 1); /* allow_update */ - zebra_end_trans(zh); + if (zebra_end_trans(zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + res = ZEBRA_FAIL; + } return res; } @@ -2128,7 +2299,9 @@ ZEBRA_RES zebra_delete_record (ZebraHandle zh, int force_update) { ZEBRA_RES res; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); + assert(sysno); assert(buf); yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno); @@ -2145,7 +2318,11 @@ ZEBRA_RES zebra_delete_record (ZebraHandle zh, match,fname, force_update, 1); /* allow_update */ - zebra_end_trans(zh); + if (zebra_end_trans(zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed"); + res = ZEBRA_FAIL; + } return res; } @@ -2159,8 +2336,12 @@ 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); @@ -2198,7 +2379,8 @@ int zebra_sort_by_specstr (ZebraHandle zh, ODR stream, 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); @@ -2242,7 +2424,7 @@ struct BFiles_struct *zebra_get_bfs(ZebraHandle zh) */ 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; @@ -2253,6 +2435,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; @@ -2268,3 +2452,12 @@ 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) +{ + const char *lock_dir = res_get_def (res, "lockDir", ""); + + strcpy (path, lock_dir); + if (*path && path[strlen(path)-1] != '/') + strcat (path, "/"); +} +