X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=2ed3b39740fb4cf106b0be7f1d398a8a8a91d0a4;hb=7eec88b19326d12780b7587133ed4941cd9776a8;hp=ef44d788d44d59121162e997f907585d87680215;hpb=dfc79a96b0ad352eb2b974c9d70c5e9fb8c6b79e;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index ef44d78..2ed3b39 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.77 2002-11-07 09:07:07 adam Exp $ +/* $Id: zebraapi.c,v 1.84 2003-02-25 21:46:52 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -36,12 +36,20 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "index.h" #include +/* simple asserts to validate the most essential input args */ +#define ASSERTZH assert(zh && zh->service) +#define ASSERTZHRES assert(zh && zh->service && zh->res) +#define ASSERTZS assert(zs) + static Res zebra_open_res (ZebraHandle zh); static void zebra_close_res (ZebraHandle zh); -static void zebra_chdir (ZebraService zh) + +static void zebra_chdir (ZebraService zs) { - const char *dir = res_get (zh->global_res, "chdir"); + const char *dir ; + ASSERTZS; + dir = res_get (zs->global_res, "chdir"); if (!dir) return; logf (LOG_DEBUG, "chdir %s", dir); @@ -54,6 +62,8 @@ static void zebra_chdir (ZebraService zh) static void zebra_flush_reg (ZebraHandle zh) { + ASSERTZH; + zh->errCode=0; zebraExplain_flush (zh->reg->zei, zh); extract_flushWriteKeys (zh); @@ -71,6 +81,7 @@ ZebraHandle zebra_open (ZebraService zs) { ZebraHandle zh; const char *default_encoding; + ASSERTZS; if (!zs) return 0; @@ -169,6 +180,8 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, int record_compression = REC_COMPRESS_NONE; char *recordCompression = 0; + ASSERTZS; + reg = xmalloc (sizeof(*reg)); assert (name); @@ -218,6 +231,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, reg->isamb = 0; reg->zei = 0; reg->matchDict = 0; + reg->key_file_no = 0; zebraRankInstall (reg, rank1_class); @@ -334,6 +348,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, void zebra_admin_shutdown (ZebraHandle zh) { + ASSERTZH; + zh->errCode=0; + zebra_mutex_cond_lock (&zh->service->session_lock); zh->service->stop_flag = 1; zebra_mutex_cond_unlock (&zh->service->session_lock); @@ -341,14 +358,17 @@ void zebra_admin_shutdown (ZebraHandle zh) void zebra_admin_start (ZebraHandle zh) { - ZebraService zs = zh->service; - zh->errCode = 0; + ZebraService zs; + ASSERTZH; + zh->errCode=0; + zs = zh->service; zebra_mutex_cond_lock (&zs->session_lock); zebra_mutex_cond_unlock (&zs->session_lock); } static void zebra_register_close (ZebraService zs, struct zebra_register *reg) { + ASSERTZS; yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg); reg->stop_flag = 0; zebra_chdir (zs); @@ -387,7 +407,7 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) void zebra_stop(ZebraService zs) { if (!zs) - return ; + return ; yaz_log (LOG_LOG, "zebra_stop"); while (zs->sessions) @@ -413,11 +433,13 @@ void zebra_close (ZebraHandle zh) if (!zh) return; - + ASSERTZH; + zh->errCode=0; + zs = zh->service; yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh); if (!zh) - return ; + return ; resultSetDestroy (zh, -1, 0, 0); @@ -447,10 +469,9 @@ void zebra_close (ZebraHandle zh) } sp = &(*sp)->next; } -// if (!zs->sessions && zs->stop_flag) -// zebra_register_deactivate(zs); zebra_mutex_cond_unlock (&zs->session_lock); xfree (zh->reg_name); + zh->service=0; /* more likely to trigger an assert */ xfree (zh); } @@ -468,6 +489,9 @@ static Res 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); @@ -489,6 +513,8 @@ static Res zebra_open_res (ZebraHandle zh) static void zebra_close_res (ZebraHandle zh) { + ASSERTZH; + zh->errCode=0; if (zh->res != zh->service->global_res) res_close (zh->res); zh->res = 0; @@ -496,6 +522,8 @@ static void zebra_close_res (ZebraHandle zh) static int zebra_select_register (ZebraHandle zh, const char *new_reg) { + ASSERTZH; + zh->errCode=0; if (zh->res && strcmp (zh->reg_name, new_reg) == 0) return 0; if (!zh->res) @@ -572,7 +600,7 @@ void map_basenames_func (void *vp, const char *name, const char *value) return ; no--; for (i = 0; inum_bases; i++) - if (p->basenames[i] && !strcmp (p->basenames[i], fromdb)) + if (p->basenames[i] && !STRCASECMP (p->basenames[i], fromdb)) { p->basenames[i] = 0; for (i = 0; i < no; i++) @@ -592,6 +620,8 @@ void map_basenames (ZebraHandle zh, ODR stream, struct map_baseinfo info; struct map_baseinfo *p = &info; int i; + ASSERTZH; + zh->errCode=0; info.zh = zh; info.num_bases = *num_bases; @@ -618,6 +648,8 @@ void map_basenames (ZebraHandle zh, ODR stream, int zebra_select_database (ZebraHandle zh, const char *basename) { + ASSERTZH; + zh->errCode=0; return zebra_select_databases (zh, 1, &basename); } @@ -628,6 +660,8 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, const char *cp; int len = 0; char *new_reg = 0; + ASSERTZH; + zh->errCode=0; if (num_bases < 1) { @@ -699,6 +733,8 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream, Z_RPNQuery *query, const char *setname, int *hits) { + ASSERTZH; + zh->errCode=0; zh->hits = 0; *hits = 0; @@ -719,6 +755,8 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, { ZebraPosSet poset; int i, *pos_array; + ASSERTZH; + zh->errCode=0; if (!zh->res) { @@ -785,6 +823,8 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int *position, int *num_entries, ZebraScanEntry **entries, int *is_partial) { + ASSERTZH; + zh->errCode=0; if (zebra_begin_read (zh)) { *entries = 0; @@ -802,6 +842,8 @@ void zebra_sort (ZebraHandle zh, ODR stream, const char *output_setname, Z_SortKeySpecList *sort_sequence, int *sort_status) { + ASSERTZH; + zh->errCode=0; if (zebra_begin_read (zh)) return; resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, @@ -814,6 +856,8 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, int *statuses) { int i, status; + ASSERTZH; + zh->errCode=0; if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; switch (function) @@ -835,22 +879,31 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, int zebra_errCode (ZebraHandle zh) { - return zh->errCode; + if (zh) + return zh->errCode; + return 0; } const char *zebra_errString (ZebraHandle zh) { - return diagbib1_str (zh->errCode); + if (zh) + return diagbib1_str (zh->errCode); + return ""; } char *zebra_errAdd (ZebraHandle zh) { - return zh->errString; + if (zh) + return zh->errString; + return ""; } int zebra_auth (ZebraHandle zh, const char *user, const char *pass) { - ZebraService zs = zh->service; + ZebraService zs; + ASSERTZH; + zh->errCode=0; + zs= zh->service; if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass)) { logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS"); @@ -864,6 +917,8 @@ int zebra_auth (ZebraHandle zh, const char *user, const char *pass) void zebra_admin_import_begin (ZebraHandle zh, const char *database, const char *record_type) { + ASSERTZH; + zh->errCode=0; if (zebra_select_database(zh, database)) return; zebra_begin_trans (zh); @@ -873,6 +928,8 @@ void zebra_admin_import_begin (ZebraHandle zh, const char *database, void zebra_admin_import_end (ZebraHandle zh) { + ASSERTZH; + zh->errCode=0; zebra_end_trans (zh); } @@ -880,6 +937,8 @@ void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { int sysno; int i; + ASSERTZH; + zh->errCode=0; for (i = 0; inum_segmentRecords; i++) { Z_NamePlusRecord *npr = segment->segmentRecords[i]; @@ -922,6 +981,8 @@ int zebra_admin_exchange_record (ZebraHandle zh, int sysno = 0; char *rinfo = 0; char recid_z[256]; + ASSERTZH; + zh->errCode=0; if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) return -1; @@ -957,6 +1018,8 @@ int zebra_admin_exchange_record (ZebraHandle zh, void zebra_admin_create (ZebraHandle zh, const char *database) { ZebraService zs; + ASSERTZH; + zh->errCode=0; if (zebra_select_database (zh, database)) return; @@ -978,6 +1041,8 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, char *output_str, int output_len) { WRBUF wrbuf; + ASSERTZH; + zh->errCode=0; if (!zh->reg->zebra_maps) return -1; wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "", @@ -999,6 +1064,8 @@ void zebra_set_state (ZebraHandle zh, int val, int seqno) char *fname; long p = getpid(); FILE *f; + ASSERTZH; + zh->errCode=0; sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); @@ -1016,6 +1083,8 @@ void zebra_get_state (ZebraHandle zh, char *val, int *seqno) char *fname; FILE *f; + ASSERTZH; + zh->errCode=0; sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); f = fopen (fname, "r"); @@ -1035,6 +1104,7 @@ int zebra_begin_read (ZebraHandle zh) int dirty = 0; char val; int seqno; + ASSERTZH; assert (zh->res); @@ -1045,6 +1115,7 @@ int zebra_begin_read (ZebraHandle zh) zebra_flush_reg (zh); return 0; } + zh->errCode=0; #if HAVE_SYS_TIMES_H times (&zh->tms1); #endif @@ -1104,11 +1175,11 @@ int zebra_begin_read (ZebraHandle zh) void zebra_end_read (ZebraHandle zh) { + ASSERTZH; (zh->trans_no)--; if (zh->trans_no != 0) return; - #if HAVE_SYS_TIMES_H times (&zh->tms2); logf (LOG_LOG, "user/system: %ld/%ld", @@ -1127,6 +1198,7 @@ void zebra_begin_trans (ZebraHandle zh) int seqno = 0; char val = '?'; const char *rval = 0; + ASSERTZHRES; assert (zh->res); @@ -1135,6 +1207,7 @@ void zebra_begin_trans (ZebraHandle zh) { return; } + zh->errCode=0; yaz_log (LOG_LOG, "zebra_begin_trans"); @@ -1210,11 +1283,11 @@ void zebra_end_trans (ZebraHandle zh) char val; int seqno; const char *rval; + ASSERTZH; zh->trans_no--; if (zh->trans_no != 0) return; - yaz_log (LOG_LOG, "zebra_end_trans"); rval = res_get (zh->res, "shadow"); @@ -1255,18 +1328,24 @@ void zebra_end_trans (ZebraHandle zh) void zebra_repository_update (ZebraHandle zh) { + ASSERTZH; + zh->errCode=0; logf (LOG_LOG, "updating %s", zh->rGroup.path); repositoryUpdate (zh); } void zebra_repository_delete (ZebraHandle zh) { + ASSERTZH; + zh->errCode=0; logf (LOG_LOG, "deleting %s", zh->rGroup.path); repositoryDelete (zh); } void zebra_repository_show (ZebraHandle zh) { + ASSERTZH; + zh->errCode=0; repositoryShow (zh); } @@ -1276,6 +1355,8 @@ int zebra_commit (ZebraHandle zh) char val; const char *rval; BFiles bfs; + ASSERTZH; + zh->errCode=0; if (!zh->res) { @@ -1328,6 +1409,8 @@ int zebra_init (ZebraHandle zh) { const char *rval; BFiles bfs = 0; + ASSERTZH; + zh->errCode=0; if (!zh->res) { @@ -1350,6 +1433,8 @@ int zebra_init (ZebraHandle zh) int zebra_compact (ZebraHandle zh) { BFiles bfs; + ASSERTZH; + zh->errCode=0; if (!zh->res) { zh->errCode = 109; @@ -1364,7 +1449,12 @@ int zebra_compact (ZebraHandle zh) int zebra_record_insert (ZebraHandle zh, const char *buf, int len) { int sysno = 0; + int olderr; + ASSERTZH; + zh->errCode=0; zebra_begin_trans (zh); + if (zh->errCode) + return 0; /* bad sysno */ extract_rec_in_mem (zh, "grs.sgml", buf, len, "Default", /* database */ @@ -1374,40 +1464,76 @@ int zebra_record_insert (ZebraHandle zh, const char *buf, int len) 1 /* store_keys */, 1 /* store_data */, 0 /* match criteria */); + olderr=zh->errCode; zebra_end_trans (zh); + if (olderr) + zh->errCode=olderr; return sysno; } void zebra_set_group (ZebraHandle zh, struct recordGroup *rg) { + ASSERTZH; + zh->errCode=0; memcpy (&zh->rGroup, rg, sizeof(*rg)); } void zebra_result (ZebraHandle zh, int *code, char **addinfo) { + ASSERTZH; *code = zh->errCode; *addinfo = zh->errString; } void zebra_shadow_enable (ZebraHandle zh, int value) { + ASSERTZH; + zh->errCode=0; zh->shadow_enable = value; } int zebra_record_encoding (ZebraHandle zh, const char *encoding) { + ASSERTZH; + zh->errCode=0; xfree (zh->record_encoding); + + /* + * Fixme! + */ + + if (zh->iconv_to_utf8 != 0) + yaz_iconv_close(zh->iconv_to_utf8); + if (zh->iconv_from_utf8 != 0) + yaz_iconv_close(zh->iconv_from_utf8); + zh->record_encoding = xstrdup (encoding); + + logf(LOG_DEBUG, "Reset record encoding: %s", encoding); + + zh->iconv_to_utf8 = + yaz_iconv_open ("UTF-8", encoding); + if (zh->iconv_to_utf8 == 0) + yaz_log (LOG_WARN, "iconv: %s to UTF-8 unsupported", encoding); + zh->iconv_from_utf8 = + yaz_iconv_open (encoding, "UTF-8"); + if (zh->iconv_to_utf8 == 0) + yaz_log (LOG_WARN, "iconv: UTF-8 to %s unsupported", encoding); + return 0; } void zebra_set_resource(ZebraHandle zh, const char *name, const char *value) { + ASSERTZH; + zh->errCode=0; res_put(zh->res, name, value); } const char *zebra_get_resource(ZebraHandle zh, const char *name, const char *defaultvalue) { + ASSERTZH; + zh->errCode=0; return res_get_def( zh->res, name, (char *)defaultvalue); }