X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=a8e803991a54d646f6052f877d2d126acc27c43f;hp=0c94394ae0fd07268ae8fee7495ff57a0c90a3c1;hb=0f563f23506dabd7c84bdb750d4539b2b6cacf02;hpb=060a5dbb2b5cf572656bd6513395e52ee103b8f0 diff --git a/index/zebraapi.c b/index/zebraapi.c index 0c94394..a8e8039 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,5 +1,5 @@ -/* $Id: zebraapi.c,v 1.211 2006-04-04 00:00:18 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: zebraapi.c,v 1.243 2007-01-16 15:01:15 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include @@ -36,6 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include "index.h" +#include "rank.h" #include "orddict.h" #include #include @@ -53,6 +54,15 @@ static int log_level_initialized = 0; 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) { const char *dir ; @@ -69,14 +79,16 @@ 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"); zebraExplain_flush (zh->reg->zei, zh); - - extract_flushWriteKeys (zh, 1 /* final */); - zebra_index_merge (zh ); + + key_block_flush(zh->reg->key_block, 1); + + zebra_index_merge(zh); + return ZEBRA_OK; } static struct zebra_register *zebra_register_open(ZebraService zs, @@ -129,6 +141,7 @@ ZebraHandle zebra_open(ZebraService zs, Res res) zh->shadow_enable = 1; zh->m_staticrank = 0; + zh->m_segment_indexing = 0; default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1"); @@ -161,15 +174,17 @@ ZebraHandle zebra_open(ZebraService zs, Res res) return zh; } -ZebraService zebra_start (const char *configName) +ZebraService zebra_start(const char *configName) { return zebra_start_res(configName, 0, 0); } -ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) +ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) { Res res; + zebra_flock_init(); + if (!log_level_initialized) { log_level = yaz_log_module_level("zebraapi"); @@ -194,7 +209,18 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) res_close(res); return 0; } + if (zebra_check_res(res)) + { + yaz_log(YLOG_FATAL, "Configuration error(s) for %s", + configName); + return 0; + } } + else + { + zebra_check_res(res); + } + zh = xmalloc(sizeof(*zh)); zh->global_res = res; zh->sessions = 0; @@ -232,9 +258,18 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) } } + zh->timing = yaz_timing_create(); zh->path_root = res_get (zh->global_res, "root"); zh->nmem = nmem_create(); zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem); + + if (1) + { + const char *module_path = res_get(res, "modulePath"); + if (module_path) + recTypeClass_load_modules(&zh->record_classes, zh->nmem, + module_path); + } return zh; } return 0; @@ -280,6 +315,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, const char *recordCompression = 0; const char *profilePath; char cwd[1024]; + int sort_type = ZEBRA_SORT_TYPE_FLAT; ZEBRA_RES ret = ZEBRA_OK; ASSERTZS; @@ -325,8 +361,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, } getcwd(cwd, sizeof(cwd)-1); - profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); - yaz_log(YLOG_DEBUG, "profilePath=%s cwd=%s", profilePath, cwd); + profilePath = res_get_def(res, "profilePath", 0); data1_set_tabpath (reg->dh, profilePath); data1_set_tabroot (reg->dh, reg_path); @@ -345,30 +380,23 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, } reg->rank_classes = NULL; - reg->key_buf = 0; - + reg->key_block = 0; reg->keys = zebra_rec_keys_open(); -#if NATTR reg->sortKeys = zebra_rec_keys_open(); -#else - reg->sortKeys.buf = 0; - reg->sortKeys.buf_max = 0; -#endif reg->records = 0; reg->dict = 0; - reg->sortIdx = 0; + reg->sort_index = 0; reg->isams = 0; reg->matchDict = 0; reg->isamc = 0; reg->isamb = 0; reg->zei = 0; - reg->key_file_no = 0; - reg->ptr_i = 0; + /* installing rank classes */ zebraRankInstall (reg, rank_1_class); - zebraRankInstall (reg, rank_zv_class); + zebraRankInstall (reg, rank_similarity_class); zebraRankInstall (reg, rank_static_class); recordCompression = res_get_def (res, "recordCompression", "none"); @@ -401,9 +429,22 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, yaz_log (YLOG_WARN, "dict_open failed"); ret = ZEBRA_FAIL; } - if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw))) + + + if (res_get_match (res, "sortindex", "f", "f")) + sort_type = ZEBRA_SORT_TYPE_FLAT; + else if (res_get_match (res, "sortindex", "i", "f")) + sort_type = ZEBRA_SORT_TYPE_ISAMB; + else { - yaz_log (YLOG_WARN, "sortIdx_open failed"); + yaz_log (YLOG_WARN, "bad_value for 'sortindex'"); + ret = ZEBRA_FAIL; + } + + + if (!(reg->sort_index = zebra_sort_open(reg->bfs, rw, sort_type))) + { + yaz_log (YLOG_WARN, "zebra_sort_open failed"); ret = ZEBRA_FAIL; } if (res_get_match (res, "isam", "s", ISAM_DEFAULT)) @@ -463,7 +504,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, { reg->zei = zebraExplain_open(reg->records, reg->dh, res, rw, reg, - explain_extract); + zebra_extract_explain); if (!reg->zei) { yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information"); @@ -482,7 +523,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh) { - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_shutdown"); zebra_mutex_cond_lock (&zh->service->session_lock); @@ -494,7 +535,7 @@ 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"); zs = zh->service; zebra_mutex_cond_lock (&zs->session_lock); @@ -514,7 +555,7 @@ static void zebra_register_close(ZebraService zs, struct zebra_register *reg) dict_close (reg->dict); if (reg->matchDict) dict_close (reg->matchDict); - sortIdx_close (reg->sortIdx); + zebra_sort_close(reg->sort_index); if (reg->isams) isams_close (reg->isams); if (reg->isamc) @@ -530,13 +571,9 @@ static void zebra_register_close(ZebraService zs, struct zebra_register *reg) data1_destroy (reg->dh); zebra_rec_keys_close(reg->keys); -#if NATTR zebra_rec_keys_close(reg->sortKeys); -#else - xfree(reg->sortKeys.buf); -#endif - xfree(reg->key_buf); + key_block_destroy(®->key_block); xfree(reg->name); xfree(reg); } @@ -545,8 +582,6 @@ ZEBRA_RES zebra_stop(ZebraService zs) { if (!zs) return ZEBRA_OK; - yaz_log (log_level, "zebra_stop"); - while (zs->sessions) { zebra_close (zs->sessions); @@ -560,20 +595,28 @@ ZEBRA_RES zebra_stop(ZebraService zs) recTypeClass_destroy(zs->record_classes); nmem_destroy(zs->nmem); res_close (zs->global_res); + + yaz_timing_stop(zs->timing); + yaz_log (YLOG_LOG, "zebra_stop: %4.2f %4.2f %4.2f", + yaz_timing_get_real(zs->timing), + yaz_timing_get_user(zs->timing), + yaz_timing_get_sys(zs->timing)); + + + yaz_timing_destroy(&zs->timing); xfree(zs); return ZEBRA_OK; } -ZEBRA_RES zebra_close (ZebraHandle zh) +ZEBRA_RES zebra_close(ZebraHandle zh) { ZebraService zs; struct zebra_session **sp; int i; yaz_log(log_level, "zebra_close"); - if (!zh) - return ZEBRA_OK; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); + zh->errCode = 0; zs = zh->service; @@ -755,6 +798,15 @@ 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); } + if (zh->res) + { + if (res_get_int(zh->res, "segment", &zh->m_segment_indexing) == + ZEBRA_OK) + { + yaz_log(YLOG_DEBUG, "segment indexing set and is %d", + zh->m_segment_indexing); + } + } } void map_basenames_func (void *vp, const char *name, const char *value) @@ -840,7 +892,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); @@ -853,7 +906,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", @@ -961,29 +1015,41 @@ ZEBRA_RES zebra_set_approx_limit(ZebraHandle zh, zint approx_limit) return ZEBRA_OK; } -ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, - const char *setname, zint *hits) +ZEBRA_RES zebra_search_RPN_x(ZebraHandle zh, ODR o, Z_RPNQuery *query, + const char *setname, zint *hits, + int *estimated_hit_count, + int *partial_resultset) { ZEBRA_RES r; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); + assert(o); assert(query); assert(hits); assert(setname); yaz_log(log_level, "zebra_search_rpn"); - zh->hits = 0; - *hits = 0; if (zebra_begin_read(zh) == ZEBRA_FAIL) return ZEBRA_FAIL; r = resultSetAddRPN(zh, odr_extract_mem(o), query, - zh->num_basenames, zh->basenames, setname); + zh->num_basenames, zh->basenames, setname, + hits, estimated_hit_count, partial_resultset); zebra_end_read(zh); - *hits = zh->hits; return r; } +ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query, + const char *setname, zint *hits) +{ + int estimated_hit_count; + int partial_resultset; + return zebra_search_RPN_x(zh, o, query, setname, hits, + &estimated_hit_count, + &partial_resultset); +} + ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, const char *setname, Z_RecordComposition *comp, @@ -994,7 +1060,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); @@ -1038,12 +1105,15 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, else if (poset[i].sysno) { char *buf; - int len; + int len = 0; zebra_snippets *hit_snippet = zebra_snippets_create(); + /* we disable hit snippets for now. It does not work well + and it slows retrieval down a lot */ +#if 0 zebra_snippets_hit_vector(zh, setname, poset[i].sysno, hit_snippet); - +#endif recs[i].errCode = zebra_record_fetch(zh, poset[i].sysno, poset[i].score, hit_snippet, @@ -1121,7 +1191,9 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, { ZEBRA_RES res; RSET limit_rset = 0; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); + assert(stream); assert(zapt); assert(position); @@ -1148,10 +1220,10 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, return ZEBRA_FAIL; } } - res = rpn_scan (zh, stream, zapt, attributeset, - zh->num_basenames, zh->basenames, position, - num_entries, entries, is_partial, limit_rset, 0); - zebra_end_read (zh); + res = rpn_scan(zh, stream, zapt, attributeset, + zh->num_basenames, zh->basenames, position, + num_entries, entries, is_partial, limit_rset); + zebra_end_read(zh); return res; } @@ -1162,7 +1234,7 @@ 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); @@ -1244,9 +1316,9 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass) char u[40]; ZebraService zs; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); - zs= zh->service; + zs = zh->service; sprintf(u, "perm.%.30s", user ? user : "anonymous"); p = res_get(zs->global_res, u); @@ -1272,7 +1344,6 @@ 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); if (zebra_select_database(zh, database) == ZEBRA_FAIL) @@ -1282,7 +1353,7 @@ 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"); return zebra_end_trans(zh); } @@ -1290,9 +1361,9 @@ ZEBRA_RES zebra_admin_import_end (ZebraHandle zh) ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { ZEBRA_RES res = ZEBRA_OK; - SYSNO sysno; + zint sysno; int i; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); yaz_log(log_level, "zebra_admin_import_segment"); for (i = 0; inum_segmentRecords; i++) @@ -1332,11 +1403,11 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh, /* 4 = update. Insert/replace */ { ZEBRA_RES res; - SYSNO sysno = 0; + zint sysno = 0; char *rinfo = 0; char recid_z[256]; int db_ord; - ASSERTZH; + ZEBRA_CHECK_HANDLE(zh); assert(action>0 && action <=4); assert(rec_buf); @@ -1382,15 +1453,15 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh, } action = 1; /* make it an insert (if it's an update).. */ } - res = buffer_extract_record (zh, rec_buf, rec_len, - action == 3 ? 1 : 0 /* delete flag */, - 0, /* test mode */ - 0, /* recordType */ - &sysno, - 0, /* match */ - 0, /* fname */ - 0, /* force update */ - 1 /* allow update */ + res = zebra_buffer_extract_record(zh, rec_buf, rec_len, + action == 3 ? 1 : 0 /* delete flag */, + 0, /* test mode */ + 0, /* recordType */ + &sysno, + 0, /* match */ + 0, /* fname */ + 0, /* force update */ + 1 /* allow update */ ); if (res == ZEBRA_FAIL) { @@ -1446,8 +1517,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_CHECK_HANDLE(zh); if (zebra_select_database (zh, db) == ZEBRA_FAIL) return ZEBRA_FAIL; @@ -1456,12 +1528,20 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) if (zh->reg->isamb) { int db_ord; - zebraExplain_curDatabase (zh->reg->zei, db); - db_ord = zebraExplain_get_database_ord(zh->reg->zei); - dict_delete_subtree_ord(zh->reg->matchDict, db_ord, - 0 /* handle */, 0 /* func */); - zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle); - zebraExplain_removeDatabase(zh->reg->zei, zh); + if (zebraExplain_curDatabase (zh->reg->zei, db)) + { + zebra_setError(zh, YAZ_BIB1_DATABASE_DOES_NOT_EXIST, db); + ret = ZEBRA_FAIL; + } + else + { + db_ord = zebraExplain_get_database_ord(zh->reg->zei); + dict_delete_subtree_ord(zh->reg->matchDict, db_ord, + 0 /* handle */, 0 /* func */); + zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle); + zebraExplain_removeDatabase(zh->reg->zei, zh); + zebra_remove_file_match(zh); + } } else { @@ -1480,8 +1560,8 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db) ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db) { - ASSERTZH; yaz_log(log_level, "zebra_create_database %s", db); + ZEBRA_CHECK_HANDLE(zh); assert(db); if (zebra_select_database (zh, db) == ZEBRA_FAIL) @@ -1527,6 +1607,16 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, return wrbuf_len(wrbuf); } +/** \brief set register state (state*.LCK) + \param zh Zebra handle + \param val state + \param seqno sequence number + + val is one of: + d=writing to shadow(dirty) + o=no writing, + c=commit +*/ static void zebra_set_state (ZebraHandle zh, int val, int seqno) { char state_fname[256]; @@ -1610,7 +1700,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) { @@ -1636,7 +1726,6 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) assert (zh->res); if (rw) { - int pass; int seqno = 0; char val = '?'; const char *rval = 0; @@ -1672,51 +1761,40 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) if (zh->shadow_enable) rval = res_get (zh->res, "shadow"); - for (pass = 0; pass < 2; pass++) + if (rval) { - if (rval) - { - zebra_lock_r (zh->lock_normal); - zebra_lock_w (zh->lock_shadow); - } - else + zebra_lock_r(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); + } + else + { + zebra_lock_w(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); + } + zebra_get_state (zh, &val, &seqno); + if (val != 'o') + { + /* either we didn't finish commit or shadow is dirty */ + zebra_unlock (zh->lock_shadow); + zebra_unlock (zh->lock_normal); + if (zebra_commit (zh)) { - zebra_lock_w (zh->lock_normal); - zebra_lock_w (zh->lock_shadow); + zh->trans_no--; + zh->trans_w_no = 0; + return ZEBRA_FAIL; } - - zebra_get_state (zh, &val, &seqno); - if (val == 'c') + if (rval) { - yaz_log (YLOG_WARN, "previous transaction didn't finish commit"); - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); - zebra_commit (zh); - continue; + zebra_lock_r(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); } - else if (val == 'd') + else { - if (rval) - { - BFiles bfs = bfs_create (res_get (zh->res, "shadow"), - zh->path_reg); - yaz_log (YLOG_WARN, "previous transaction didn't reach commit"); - bf_commitClean (bfs, rval); - bfs_destroy (bfs); - } - else - { - yaz_log (YLOG_WARN, "your previous transaction didn't finish"); - } + zebra_lock_w(zh->lock_normal); + zebra_lock_w(zh->lock_shadow); } - break; - } - if (pass == 2) - { - yaz_log (YLOG_FATAL, "zebra_begin_trans couldn't finish commit"); - abort(); - return ZEBRA_FAIL; } + zebra_set_state (zh, 'd', seqno); zh->reg = zebra_register_open(zh->service, zh->reg_name, @@ -1751,8 +1829,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw) if (zh->trans_no != 1) { - zebra_flush_reg (zh); - return ZEBRA_OK; + return zebra_flush_reg (zh); } #if HAVE_SYS_TIMES_H times (&zh->tms1); @@ -1821,8 +1898,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); } @@ -1832,7 +1910,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"); @@ -1882,10 +1961,10 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) zh->records_processed, zh->records_inserted, zh->records_updated, zh->records_deleted); - status->processed = (int) zh->records_processed; - status->inserted = (int) zh->records_inserted; - status->updated = (int) zh->records_updated; - status->deleted = (int) zh->records_deleted; + status->processed = zh->records_processed; + status->inserted = zh->records_inserted; + status->updated = zh->records_updated; + status->deleted = zh->records_deleted; zebra_get_state (zh, &val, &seqno); if (val != 'd') @@ -1915,31 +1994,33 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) return ZEBRA_OK; } -int zebra_repository_update (ZebraHandle zh, const char *path) +ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path) { ASSERTZH; assert(path); yaz_log (log_level, "updating %s", path); - repositoryUpdate (zh, path); - return 0; + + if (zh->m_record_id && !strcmp (zh->m_record_id, "file")) + return zebra_update_file_match(zh, path); + else + return zebra_update_from_path(zh, path); } -int zebra_repository_delete (ZebraHandle zh, const char *path) +ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path) { ASSERTZH; assert(path); yaz_log (log_level, "deleting %s", path); - repositoryDelete (zh, path); - return 0; + return zebra_delete_from_path(zh, path); } -int zebra_repository_show (ZebraHandle zh, const char *path) +ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path) { ASSERTZH; assert(path); yaz_log(log_level, "zebra_repository_show"); repositoryShow (zh, path); - return 0; + return ZEBRA_OK; } static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) @@ -1948,6 +2029,8 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) char val; const char *rval; BFiles bfs; + ZEBRA_RES res = ZEBRA_OK; + ASSERTZH; zebra_select_default_database(zh); @@ -1956,78 +2039,99 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only) zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; return ZEBRA_FAIL; } - rval = res_get (zh->res, "shadow"); + rval = res_get(zh->res, "shadow"); if (!rval) { yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined"); return ZEBRA_OK; } - zebra_lock_w (zh->lock_normal); - zebra_lock_r (zh->lock_shadow); + zebra_lock_w(zh->lock_normal); + zebra_lock_r(zh->lock_shadow); - bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg); + bfs = bfs_create(res_get (zh->res, "register"), zh->path_reg); + if (!bfs) + { + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + return ZEBRA_FAIL; + } + zebra_get_state(zh, &val, &seqno); - zebra_get_state (zh, &val, &seqno); + if (val == 'd') + { + yaz_log(YLOG_WARN, "previous transaction didn't reach commit"); + clean_only = 1; + } if (rval && *rval) bf_cache (bfs, rval); if (bf_commitExists (bfs)) { if (clean_only) - zebra_set_state (zh, 'd', seqno); + zebra_set_state(zh, 'd', seqno); else { - zebra_set_state (zh, 'c', seqno); + zebra_set_state(zh, 'c', seqno); - yaz_log (YLOG_DEBUG, "commit start"); - bf_commitExec (bfs); -#ifndef WIN32 - sync (); -#endif + yaz_log(YLOG_DEBUG, "commit start"); + if (bf_commitExec (bfs)) + res = ZEBRA_FAIL; + } + if (res == ZEBRA_OK) + { + seqno++; + zebra_set_state(zh, 'o', seqno); + + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + + zebra_lock_w(zh->lock_shadow); + bf_commitClean(bfs, rval); + zebra_unlock(zh->lock_shadow); + } + else + { + zebra_unlock(zh->lock_shadow); + zebra_unlock(zh->lock_normal); + yaz_log(YLOG_WARN, "zebra_commit: failed"); } - 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"); + yaz_log(log_level, "nothing to commit"); } - bfs_destroy (bfs); + bfs_destroy(bfs); - return ZEBRA_OK; + return res; } ZEBRA_RES zebra_clean(ZebraHandle zh) { - ASSERTZH; yaz_log(log_level, "zebra_clean"); + ZEBRA_CHECK_HANDLE(zh); return zebra_commit_ex(zh, 1); } ZEBRA_RES zebra_commit(ZebraHandle zh) { - ASSERTZH; yaz_log(log_level, "zebra_commit"); + ZEBRA_CHECK_HANDLE(zh); return zebra_commit_ex(zh, 0); } + ZEBRA_RES zebra_init(ZebraHandle zh) { const char *rval; BFiles bfs = 0; - ASSERTZH; + yaz_log(log_level, "zebra_init"); + ZEBRA_CHECK_HANDLE(zh); + zebra_select_default_database(zh); if (!zh->res) { @@ -2055,8 +2159,9 @@ ZEBRA_RES zebra_init(ZebraHandle zh) ZEBRA_RES zebra_compact(ZebraHandle zh) { BFiles bfs; - ASSERTZH; + yaz_log(log_level, "zebra_compact"); + ZEBRA_CHECK_HANDLE(zh); if (!zh->res) { zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; @@ -2070,10 +2175,17 @@ 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) @@ -2085,9 +2197,9 @@ void zebra_shadow_enable(ZebraHandle zh, int value) ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) { - ASSERTZH; - assert(encoding); yaz_log(log_level, "zebra_octet_term_encoding %s", encoding); + ZEBRA_CHECK_HANDLE(zh); + assert(encoding); if (zh->iconv_to_utf8 != 0) yaz_iconv_close(zh->iconv_to_utf8); @@ -2108,8 +2220,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_CHECK_HANDLE(zh); xfree(zh->record_encoding); zh->record_encoding = 0; if (encoding) @@ -2119,10 +2231,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); + ASSERTZH; res_set(zh->res, name, value); } @@ -2142,57 +2254,36 @@ 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; } -/* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve - so that it's identicical to the original api_records_retrieve */ -void api_records_retrieve (ZebraHandle zh, ODR stream, - const char *setname, Z_RecordComposition *comp, - oid_value input_format, int num_recs, - ZebraRetrievalRecord *recs) -{ - zebra_records_retrieve(zh, stream, setname, comp, input_format, - num_recs, recs); -} - -/* --------------------------------------------------------------------------- - Record insert(=update), delete - - If sysno is provided, then it's used to identify the record. - If not, and match_criteria is provided, then sysno is guessed - If not, and a record is provided, then sysno is got from there -NOTE: Now returns 0 at success and updates sysno, which is an int* - 20-jun-2003 Heikki -*/ - -int zebra_add_record(ZebraHandle zh, - const char *buf, int buf_size) +ZEBRA_RES zebra_add_record(ZebraHandle zh, + const char *buf, int buf_size) { return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0); } -ZEBRA_RES zebra_insert_record (ZebraHandle zh, - const char *recordType, - SYSNO *sysno, const char *match, - const char *fname, - const char *buf, int buf_size, int force_update) +ZEBRA_RES zebra_insert_record(ZebraHandle zh, + const char *recordType, + zint *sysno, const char *match, + const char *fname, + const char *buf, int buf_size, int force_update) { ZEBRA_RES res; ASSERTZH; @@ -2205,14 +2296,14 @@ ZEBRA_RES zebra_insert_record (ZebraHandle zh, if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) return ZEBRA_FAIL; - res = buffer_extract_record (zh, buf, buf_size, - 0, /* delete_flag */ - 0, /* test_mode */ - recordType, - sysno, - match, fname, - 0, - 0); /* allow_update */ + res = zebra_buffer_extract_record(zh, buf, buf_size, + 0, /* delete_flag */ + 0, /* test_mode */ + recordType, + sysno, + match, fname, + 0, + 0); /* allow_update */ if (zebra_end_trans(zh) != ZEBRA_OK) { yaz_log(YLOG_WARN, "zebra_end_trans failed"); @@ -2221,15 +2312,17 @@ ZEBRA_RES zebra_insert_record (ZebraHandle zh, return res; } -ZEBRA_RES zebra_update_record (ZebraHandle zh, - const char *recordType, - SYSNO* sysno, const char *match, - const char *fname, - const char *buf, int buf_size, - int force_update) +ZEBRA_RES zebra_update_record(ZebraHandle zh, + const char *recordType, + zint *sysno, const char *match, + const char *fname, + const char *buf, int buf_size, + int force_update) { ZEBRA_RES res; - ASSERTZH; + + ZEBRA_CHECK_HANDLE(zh); + assert(buf); yaz_log(log_level, "zebra_update_record"); @@ -2240,14 +2333,14 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh, if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) return ZEBRA_FAIL; - res = buffer_extract_record (zh, buf, buf_size, - 0, /* delete_flag */ - 0, /* test_mode */ - recordType, - sysno, - match, fname, - force_update, - 1); /* allow_update */ + res = zebra_buffer_extract_record(zh, buf, buf_size, + 0, /* delete_flag */ + 0, /* test_mode */ + recordType, + sysno, + match, fname, + force_update, + 1); /* allow_update */ if (zebra_end_trans(zh) != ZEBRA_OK) { yaz_log(YLOG_WARN, "zebra_end_trans failed"); @@ -2256,31 +2349,34 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh, return res; } -ZEBRA_RES zebra_delete_record (ZebraHandle zh, - const char *recordType, - SYSNO *sysno, const char *match, - const char *fname, - const char *buf, int buf_size, - int force_update) +ZEBRA_RES zebra_delete_record(ZebraHandle zh, + const char *recordType, + zint *sysno, const char *match, + const char *fname, + const char *buf, int buf_size, + int force_update) { ZEBRA_RES res; - ASSERTZH; - assert(sysno); + + ZEBRA_CHECK_HANDLE(zh); + assert(buf); - yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno); + yaz_log(log_level, "zebra_delete_record"); + if (sysno) + yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno); if (buf_size < 1) buf_size = strlen(buf); if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL) return ZEBRA_FAIL; - res = buffer_extract_record (zh, buf, buf_size, - 1, /* delete_flag */ - 0, /* test_mode */ - recordType, - sysno, - match,fname, - force_update, - 1); /* allow_update */ + res = zebra_buffer_extract_record(zh, buf, buf_size, + 1, /* delete_flag */ + 0, /* test_mode */ + recordType, + sysno, + match,fname, + force_update, + 1); /* allow_update */ if (zebra_end_trans(zh) != ZEBRA_OK) { yaz_log(YLOG_WARN, "zebra_end_trans failed"); @@ -2299,8 +2395,13 @@ 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); @@ -2338,7 +2439,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); @@ -2382,7 +2484,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; @@ -2393,6 +2495,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; @@ -2408,12 +2512,20 @@ void zebra_setError_zint(ZebraHandle zh, int code, zint i) zh->errString = nmem_strdup(zh->nmem_error, vstr); } -void zebra_lock_prefix (Res res, char *path) +void zebra_lock_prefix(Res res, char *path) { const char *lock_dir = res_get_def (res, "lockDir", ""); - - strcpy (path, lock_dir); + + strcpy(path, lock_dir); if (*path && path[strlen(path)-1] != '/') strcat (path, "/"); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +