X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=cb05bb6d7c12af5e3d45be3d661fe6e545a59512;hb=4e48a2f759ac1e7224f00d7c091bb840885cf7d2;hp=5f4a9dbc076a47581211cad23b392b280a6f46ea;hpb=6cb032fd2ece4742e3516e0941507143f677e5cd;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 5f4a9db..cb05bb6 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.168 2005-05-11 12:39:37 adam Exp $ +/* $Id: zebraapi.c,v 1.203 2006-03-13 17:42:09 mike 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,8 @@ 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 void zebra_chdir (ZebraService zs) { @@ -69,21 +73,20 @@ static void zebra_flush_reg (ZebraHandle zh) { ASSERTZH; 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 ); } -static struct zebra_register *zebra_register_open (ZebraService zs, - const char *name, - int rw, int useshadow, - Res res, - const char *reg_path); +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,13 +111,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 = DEFAULT_APPROX_LIMIT; zh->trans_no = 0; zh->trans_w_no = 0; @@ -122,8 +128,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); @@ -168,34 +175,63 @@ 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(log_level, "zebra_start %s",configName); - assert(configName); - - if ((res = res_open (configName, def_res, over_res))) + if ((res = res_open(def_res, over_res))) { - ZebraService zh = xmalloc(sizeof(*zh)); + const char *passwd_plain = 0; + const char *passwd_encrypt = 0; + 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); zebra_mutex_cond_init (&zh->session_lock); - if (!res_get (zh->global_res, "passwd")) + passwd_plain = res_get (zh->global_res, "passwd"); + passwd_encrypt = res_get (zh->global_res, "passwd.c"); + dbaccess = res_get (zh->global_res, "dbaccess"); + + if (!passwd_plain && !passwd_encrypt) zh->passwd_db = NULL; - else + else { - zh->passwd_db = passwd_db_open (); + zh->passwd_db = passwd_db_open(); if (!zh->passwd_db) yaz_log (YLOG_WARN|YLOG_ERRNO, "passwd_db_open failed"); else - passwd_db_file (zh->passwd_db, - res_get (zh->global_res, "passwd")); + { + if (passwd_plain) + passwd_db_file_plain(zh->passwd_db, passwd_plain); + if (passwd_encrypt) + passwd_db_file_crypt(zh->passwd_db, passwd_encrypt); + } } + + 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); @@ -224,26 +260,20 @@ 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; @@ -268,15 +298,27 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, reg->dh = data1_createx (DATA1_FLAG_XML); if (!reg->dh) + { + xfree(reg); return 0; + } reg->bfs = bfs_create (res_get (res, "register"), reg_path); if (!reg->bfs) { data1_destroy(reg->dh); + xfree(reg); return 0; } if (useshadow) - bf_cache (reg->bfs, res_get (res, "shadow")); + { + if (bf_cache (reg->bfs, res_get (res, "shadow")) == ZEBRA_FAIL) + { + bfs_destroy(reg->bfs); + data1_destroy(reg->dh); + xfree(reg); + return 0; + } + } getcwd(cwd, sizeof(cwd)-1); profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); @@ -286,17 +328,26 @@ 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); + if ((reg->zebra_maps = zebra_maps_open (res, reg_path)) == 0) { + /* ### Do we need to destroy reg->recTypes? */ + bfs_destroy(reg->bfs); + data1_destroy(reg->dh); + 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; @@ -306,12 +357,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")) @@ -399,6 +450,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information"); return 0; } + reg->active = 2; yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg); return reg; @@ -408,7 +460,6 @@ ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh) { ASSERTZH; yaz_log(log_level, "zebra_admin_shutdown"); - zebra_clearError(zh); zebra_mutex_cond_lock (&zh->service->session_lock); zh->service->stop_flag = 1; @@ -421,7 +472,6 @@ ZEBRA_RES zebra_admin_start (ZebraHandle zh) ZebraService zs; ASSERTZH; 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); @@ -457,10 +507,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); @@ -485,7 +538,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; } @@ -509,9 +561,12 @@ ZEBRA_RES zebra_close (ZebraHandle zh) if (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); @@ -559,38 +614,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; } @@ -631,7 +682,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); @@ -644,7 +695,7 @@ 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); @@ -671,6 +722,19 @@ 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); + else + yaz_log(YLOG_LOG, "static rank unset"); + } } void map_basenames_func (void *vp, const char *name, const char *value) @@ -712,8 +776,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); } @@ -740,7 +804,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) @@ -781,6 +845,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); @@ -843,6 +933,14 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases, return ZEBRA_OK; } +ZEBRA_RES zebra_set_approx_limit(ZebraHandle zh, zint approx_limit) +{ + if (approx_limit == 0) + approx_limit = DEFAULT_APPROX_LIMIT; + zh->approx_limit = approx_limit; + return ZEBRA_OK; +} + ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, const char *setname, zint *hits) { @@ -853,7 +951,6 @@ ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, assert(hits); assert(setname); yaz_log(log_level, "zebra_search_rpn"); - zebra_clearError(zh); zh->hits = 0; *hits = 0; @@ -885,7 +982,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, @@ -923,11 +1019,18 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, { char *buf; int len; + zebra_snippets *hit_snippet = zebra_snippets_create(); + + zebra_snippets_hit_vector(zh, setname, poset[i].sysno, + hit_snippet); + recs[i].errCode = zebra_record_fetch(zh, poset[i].sysno, poset[i].score, + hit_snippet, stream, input_format, comp, &recs[i].format, &buf, &len, &recs[i].base, &recs[i].errString); + recs[i].len = len; if (len > 0) { @@ -938,15 +1041,24 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, recs[i].buf = buf; recs[i].score = poset[i].score; recs[i].sysno = poset[i].sysno; + zebra_snippets_destroy(hit_snippet); } 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); @@ -959,7 +1071,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; @@ -973,18 +1086,21 @@ 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; } -ZEBRA_RES zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, - int *position, - int *num_entries, ZebraScanEntry **entries, - int *is_partial) +ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, + oid_value attributeset, + int *position, + int *num_entries, ZebraScanEntry **entries, + int *is_partial, + const char *setname) { ZEBRA_RES res; + RSET limit_rset = 0; ASSERTZH; assert(stream); assert(zapt); @@ -993,16 +1109,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; } @@ -1021,7 +1149,7 @@ ZEBRA_RES zebra_sort (ZebraHandle zh, ODR stream, 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, @@ -1038,7 +1166,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) @@ -1089,23 +1217,15 @@ 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; sprintf(u, "perm.%.30s", user ? user : "anonymous"); @@ -1113,6 +1233,13 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) 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; @@ -1128,7 +1255,6 @@ ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database, 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); @@ -1138,7 +1264,6 @@ ZEBRA_RES zebra_admin_import_end (ZebraHandle zh) { ASSERTZH; yaz_log(log_level, "zebra_admin_import_end"); - zebra_clearError(zh); return zebra_end_trans(zh); } @@ -1149,7 +1274,7 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) int i; ASSERTZH; yaz_log(log_level, "zebra_admin_import_segment"); - zebra_clearError(zh); + for (i = 0; inum_segmentRecords; i++) { Z_NamePlusRecord *npr = segment->segmentRecords[i]; @@ -1162,13 +1287,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; } } @@ -1176,11 +1301,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 */ @@ -1190,15 +1315,19 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, SYSNO sysno = 0; char *rinfo = 0; char recid_z[256]; + int db_ord; ASSERTZH; assert(action>0 && action <=4); assert(rec_buf); yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action); - 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; @@ -1206,13 +1335,16 @@ 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; + zebra_end_trans(zh); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "Cannot insert record: already exist"); + return ZEBRA_FAIL; } memcpy (&sysno, rinfo+1, sizeof(sysno)); @@ -1222,6 +1354,8 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, if (action == 2 || action == 3) /* fail if delete or update */ { zebra_end_trans(zh); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, + "Cannot delete/update record: does not exist"); return ZEBRA_FAIL; } action = 1; /* make it an insert (if it's an update).. */ @@ -1233,16 +1367,22 @@ 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); } zebra_end_trans(zh); return res; @@ -1277,51 +1417,54 @@ static int delete_SU_handle(void *handle, int ord) return 0; } -ZEBRA_RES zebra_drop_database (ZebraHandle zh, const char *database) +ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) { ZEBRA_RES ret = ZEBRA_OK; ASSERTZH; - yaz_log(log_level, "zebra_drop_database"); - zebra_clearError(zh); + yaz_log(log_level, "zebra_drop_database %s", db); - if (zebra_select_database (zh, database) == ZEBRA_FAIL) + if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; if (zebra_begin_trans (zh, 1) == ZEBRA_FAIL) return ZEBRA_FAIL; if (zh->reg->isamb) { - zebraExplain_curDatabase (zh->reg->zei, database); - + 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; } zebra_end_trans (zh); return ret; } -ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *database) +ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db) { ASSERTZH; - yaz_log(log_level, "zebra_create_database %s", database); - assert(database); - zebra_clearError(zh); + yaz_log(log_level, "zebra_create_database %s", db); + assert(db); - if (zebra_select_database (zh, database) == ZEBRA_FAIL) + if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; if (zebra_begin_trans (zh, 1)) return ZEBRA_FAIL; /* announce database */ - if (zebraExplain_newDatabase (zh->reg->zei, database, 0 + if (zebraExplain_newDatabase (zh->reg->zei, db, 0 /* explainDatabase */)) { zebra_end_trans (zh); - zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, database); + zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, db); return ZEBRA_FAIL; } return zebra_end_trans (zh); @@ -1336,7 +1479,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, "", @@ -1359,7 +1502,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); @@ -1379,7 +1521,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"); @@ -1485,8 +1627,6 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) } zh->trans_w_no = zh->trans_no; - zebra_clearError(zh); - zh->records_inserted = 0; zh->records_updated = 0; zh->records_deleted = 0; @@ -1546,9 +1686,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 @@ -1566,6 +1706,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 { @@ -1580,7 +1721,6 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) zebra_flush_reg (zh); return ZEBRA_OK; } - zebra_clearError(zh); #if HAVE_SYS_TIMES_H times (&zh->tms1); #endif @@ -1627,9 +1767,9 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) resultSetInvalidate (zh); zebra_register_close (zh->service, zh->reg); } - zh->reg = zebra_register_open (zh->service, zh->reg_name, - 0, val == 'c' ? 1 : 0, - zh->res, zh->path_reg); + zh->reg = zebra_register_open(zh->service, zh->reg_name, + 0, val == 'c' ? 1 : 0, + zh->res, zh->path_reg); if (!zh->reg) { zebra_unlock (zh->lock_normal); @@ -1746,20 +1886,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) @@ -1767,31 +1905,29 @@ 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); @@ -1830,7 +1966,7 @@ static int zebra_commit_ex(ZebraHandle zh, int clean_only) zebra_unlock (zh->lock_shadow); zebra_unlock (zh->lock_normal); - return 0; + return ZEBRA_OK; } ZEBRA_RES zebra_clean(ZebraHandle zh) @@ -1853,7 +1989,6 @@ ZEBRA_RES zebra_init(ZebraHandle zh) BFiles bfs = 0; ASSERTZH; yaz_log(log_level, "zebra_init"); - zebra_clearError(zh); zebra_select_default_database(zh); if (!zh->res) @@ -1884,7 +2019,6 @@ ZEBRA_RES zebra_compact(ZebraHandle zh) BFiles bfs; ASSERTZH; yaz_log(log_level, "zebra_compact"); - zebra_clearError(zh); if (!zh->res) { zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; @@ -1908,7 +2042,6 @@ void zebra_shadow_enable(ZebraHandle zh, int value) { ASSERTZH; yaz_log(log_level, "zebra_shadow_enable"); - zebra_clearError(zh); zh->shadow_enable = value; } @@ -1916,8 +2049,7 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) { ASSERTZH; assert(encoding); - yaz_log(log_level, "zebra_octet_term_encoding"); - zebra_clearError(zh); + yaz_log(log_level, "zebra_octet_term_encoding %s", encoding); if (zh->iconv_to_utf8 != 0) yaz_iconv_close(zh->iconv_to_utf8); @@ -1940,7 +2072,6 @@ ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding) { ASSERTZH; yaz_log(log_level, "zebra_record_encoding"); - zebra_clearError(zh); xfree(zh->record_encoding); zh->record_encoding = 0; if (encoding) @@ -1954,7 +2085,6 @@ void zebra_set_resource(ZebraHandle zh, const char *name, const char *value) assert(name); assert(value); yaz_log(log_level, "zebra_set_resource %s:%s", name, value); - zebra_clearError(zh); res_set(zh->res, name, value); } @@ -1964,9 +2094,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; } @@ -2019,8 +2147,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, @@ -2061,10 +2188,11 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh, { ZEBRA_RES res; ASSERTZH; - assert(sysno); 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,9 +2244,9 @@ ZEBRA_RES zebra_delete_record (ZebraHandle zh, */ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query, - const char *setname, zint *numhits) + const char *setname, zint *hits) { - zint hits = 0; + zint lhits = 0; ZEBRA_RES res = ZEBRA_OK; Z_RPNQuery *query; ODR odr = odr_createmem(ODR_ENCODE); @@ -2137,14 +2265,14 @@ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query, res = ZEBRA_FAIL; } else - res = zebra_search_RPN(zh, odr, query, setname, &hits); + res = zebra_search_RPN(zh, odr, query, setname, &lhits); odr_destroy(odr); - yaz_log(log_level, "Hits: " ZINT_FORMAT, hits); + yaz_log(log_level, "Hits: " ZINT_FORMAT, lhits); - if (numhits) - *numhits = hits; + if (hits) + *hits = lhits; return res; }