X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=0c94394ae0fd07268ae8fee7495ff57a0c90a3c1;hb=060a5dbb2b5cf572656bd6513395e52ee103b8f0;hp=8cdaa51b9da3d14ee1980d23b5e0b94aec4bb927;hpb=ddcf0c647f3685b150885b547cd7d7cb71d5f722;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 8cdaa51..0c94394 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.195 2005-12-07 17:00:46 adam Exp $ +/* $Id: zebraapi.c,v 1.211 2006-04-04 00:00:18 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -36,6 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include "index.h" +#include "orddict.h" #include #include @@ -72,7 +73,6 @@ 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 */); @@ -84,7 +84,7 @@ static struct zebra_register *zebra_register_open(ZebraService zs, int rw, int useshadow, Res res, const char *reg_path); -static void zebra_register_close (ZebraService zs, struct zebra_register *reg); +static void zebra_register_close(ZebraService zs, struct zebra_register *reg); ZebraHandle zebra_open(ZebraService zs, Res res) { @@ -184,11 +184,18 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) const char *passwd_plain = 0; const char *passwd_encrypt = 0; const char *dbaccess = 0; - ZebraService zh = xmalloc(sizeof(*zh)); + ZebraService zh = 0; if (configName) - res_read_file(res, 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->sessions = 0; @@ -273,6 +280,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, const char *recordCompression = 0; const char *profilePath; char cwd[1024]; + ZEBRA_RES ret = ZEBRA_OK; ASSERTZS; @@ -289,9 +297,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; } @@ -299,6 +308,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; } @@ -308,6 +318,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; } @@ -321,7 +332,17 @@ 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; @@ -343,7 +364,6 @@ 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; @@ -357,10 +377,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) { @@ -369,12 +399,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)) { @@ -383,7 +413,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)) @@ -393,7 +423,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)) @@ -404,7 +434,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)) @@ -415,7 +445,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)) @@ -426,18 +456,26 @@ 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; } } - 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"); + 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; + } + } + + if (ret != ZEBRA_OK) + { + zebra_register_close(zs, reg); return 0; } - reg->active = 2; yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg); return reg; } @@ -446,7 +484,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; @@ -459,35 +496,32 @@ 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); 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); @@ -547,7 +581,7 @@ 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); @@ -649,7 +683,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); @@ -689,11 +723,11 @@ static void zebra_select_register (ZebraHandle zh, const char *new_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) { @@ -720,8 +754,6 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg) { if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK) yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank); - else - yaz_log(YLOG_LOG, "static rank unset"); } } @@ -939,7 +971,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; @@ -971,7 +1002,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, @@ -1099,7 +1129,7 @@ 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; @@ -1139,7 +1169,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, @@ -1156,7 +1186,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) @@ -1207,15 +1237,6 @@ 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; @@ -1224,7 +1245,7 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) ZebraService zs; ASSERTZH; - zebra_clearError(zh); + zs= zh->service; sprintf(u, "perm.%.30s", user ? user : "anonymous"); @@ -1254,7 +1275,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); @@ -1264,7 +1284,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); } @@ -1275,7 +1294,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]; @@ -1302,11 +1321,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 */ @@ -1316,12 +1335,12 @@ 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)) { @@ -1336,12 +1355,14 @@ 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); + 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; @@ -1353,7 +1374,8 @@ 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; @@ -1367,7 +1389,7 @@ 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) @@ -1377,13 +1399,18 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh, } 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; } @@ -1421,7 +1448,6 @@ 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); if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; @@ -1429,17 +1455,26 @@ 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; } @@ -1448,7 +1483,6 @@ ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db) ASSERTZH; yaz_log(log_level, "zebra_create_database %s", db); assert(db); - zebra_clearError(zh); if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; @@ -1459,7 +1493,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; } @@ -1475,7 +1512,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, "", @@ -1498,7 +1535,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); @@ -1518,7 +1554,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"); @@ -1620,12 +1656,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; @@ -1669,7 +1703,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"); @@ -1705,6 +1739,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 { @@ -1719,7 +1754,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 @@ -1764,7 +1798,7 @@ 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, @@ -1840,7 +1874,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 " @@ -1885,20 +1919,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) @@ -1906,31 +1938,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); @@ -1956,20 +1986,25 @@ 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) @@ -1992,7 +2027,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) @@ -2023,7 +2057,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; @@ -2047,7 +2080,6 @@ void zebra_shadow_enable(ZebraHandle zh, int value) { ASSERTZH; yaz_log(log_level, "zebra_shadow_enable"); - zebra_clearError(zh); zh->shadow_enable = value; } @@ -2056,7 +2088,6 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) ASSERTZH; assert(encoding); yaz_log(log_level, "zebra_octet_term_encoding %s", encoding); - zebra_clearError(zh); if (zh->iconv_to_utf8 != 0) yaz_iconv_close(zh->iconv_to_utf8); @@ -2079,7 +2110,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) @@ -2093,7 +2123,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); } @@ -2104,7 +2133,6 @@ const char *zebra_get_resource(ZebraHandle zh, ASSERTZH; assert(name); 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; } @@ -2157,8 +2185,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, @@ -2186,7 +2213,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; } @@ -2199,10 +2230,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); @@ -2216,7 +2248,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; } @@ -2245,7 +2281,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; } @@ -2368,3 +2408,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, "/"); +} +