X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=72b4b692439628da630f2bd47ddb737300a214eb;hp=53920732f53243965912d2523113269fc1fba0ed;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=1e869b75dd665a3ac79648269e1416bf7e04dcdd diff --git a/index/zebraapi.c b/index/zebraapi.c index 5392073..72b4b69 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,6 +1,6 @@ -/* $Id: zebraapi.c,v 1.118 2004-03-29 15:48:14 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: zebraapi.c,v 1.146 2005-01-15 19:38:28 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -22,6 +22,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#include #ifdef WIN32 #include #include @@ -35,34 +36,28 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include "index.h" #include -#include "zebraapi.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) -/* A simple log macro */ -/* don't break with older yazen that lack log_app2 */ -#ifdef LOG_APP2 -#define LOG_API LOG_APP2 -#else -#define LOG_API LOG_DEBUG -#endif +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_chdir (ZebraService zs) { const char *dir ; ASSERTZS; - yaz_log(LOG_API,"zebra_chdir"); + yaz_log(log_level,"zebra_chdir"); dir = res_get (zs->global_res, "chdir"); if (!dir) return; - logf (LOG_DEBUG, "chdir %s", dir); + yaz_log (YLOG_DEBUG, "chdir %s", dir); #ifdef WIN32 _chdir(dir); #else @@ -73,7 +68,7 @@ static void zebra_chdir (ZebraService zs) static void zebra_flush_reg (ZebraHandle zh) { ASSERTZH; - yaz_log(LOG_API,"zebra_flush_reg"); + yaz_log(log_level,"zebra_flush_reg"); zh->errCode=0; zebraExplain_flush (zh->reg->zei, zh); @@ -92,14 +87,19 @@ ZebraHandle zebra_open (ZebraService zs) { ZebraHandle zh; const char *default_encoding; - ASSERTZS; - yaz_log(LOG_API,"zebra_open"); + if (!log_level_initialized) + { + log_level=yaz_log_module_level("zebraapi"); + log_level_initialized=1; + } + + yaz_log(log_level,"zebra_open"); if (!zs) return 0; zh = (ZebraHandle) xmalloc (sizeof(*zh)); - yaz_log (LOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); + yaz_log (YLOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); zh->service = zs; zh->reg = 0; /* no register attached yet */ @@ -124,19 +124,20 @@ ZebraHandle zebra_open (ZebraService zs) zh->shadow_enable = 1; default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1"); - zh->record_encoding = xstrdup (default_encoding); zh->iconv_to_utf8 = yaz_iconv_open ("UTF-8", default_encoding); if (zh->iconv_to_utf8 == 0) - yaz_log (LOG_WARN, "iconv: %s to UTF-8 unsupported", + yaz_log (YLOG_WARN, "iconv: %s to UTF-8 unsupported", default_encoding); zh->iconv_from_utf8 = yaz_iconv_open (default_encoding, "UTF-8"); if (zh->iconv_to_utf8 == 0) - yaz_log (LOG_WARN, "iconv: UTF-8 to %s unsupported", + yaz_log (YLOG_WARN, "iconv: UTF-8 to %s unsupported", default_encoding); + zh->record_encoding = 0; + zebra_mutex_cond_lock (&zs->session_lock); zh->next = zs->sessions; @@ -147,17 +148,29 @@ ZebraHandle zebra_open (ZebraService zs) return zh; } -ZebraService zebra_start (const char *configName, Res def_res, Res over_res) +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) { Res res; - yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName); + if (!log_level_initialized) + { + log_level=yaz_log_module_level("zebraapi"); + log_level_initialized=1; + } + + yaz_log(log_level,"zebra_start %s",configName); + assert(configName); if ((res = res_open (configName, def_res, over_res))) { ZebraService zh = xmalloc (sizeof(*zh)); - yaz_log (LOG_DEBUG, "Read resources `%s'", configName); + yaz_log (YLOG_DEBUG, "Read resources `%s'", configName); zh->global_res = res; zh->configName = xstrdup(configName); @@ -172,24 +185,55 @@ ZebraService zebra_start (const char *configName, Res def_res, Res over_res) { zh->passwd_db = passwd_db_open (); if (!zh->passwd_db) - logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed"); + yaz_log (YLOG_WARN|YLOG_ERRNO, "passwd_db_open failed"); else passwd_db_file (zh->passwd_db, res_get (zh->global_res, "passwd")); } zh->path_root = res_get (zh->global_res, "root"); + zh->nmem = nmem_create(); + zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem); return zh; } return 0; } +void zebra_filter_info(ZebraService zs, void *cd, + void (*cb)(void *cd, const char *name)) +{ + ASSERTZS; + assert(cb); + recTypeClass_info(zs->record_classes, cd, cb); +} void zebra_pidfname(ZebraService zs, char *path) { + ASSERTZS; zebra_lock_prefix (zs->global_res, path); strcat(path, "zebrasrv.pid"); } +Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw, + int compact_flag, Res res) +{ + 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); + 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, @@ -213,7 +257,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, assert (res); - yaz_log (LOG_LOG|LOG_API, "zebra_register_open rw = %d useshadow=%d p=%p,n=%s,rp=%s", + 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); @@ -230,12 +274,11 @@ 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(LOG_LOG, "profilePath=%s cwd=%s", profilePath, cwd); + yaz_log(YLOG_DEBUG, "profilePath=%s cwd=%s", profilePath, cwd); data1_set_tabpath (reg->dh, profilePath); data1_set_tabroot (reg->dh, reg_path); - reg->recTypes = recTypes_init (reg->dh); - recTypes_default_handlers (reg->recTypes); + reg->recTypes = recTypes_init (zs->record_classes, reg->dh); reg->zebra_maps = zebra_maps_open (res, reg_path); reg->rank_classes = NULL; @@ -244,6 +287,8 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, reg->keys.buf_max = 0; reg->keys.buf = 0; + reg->keys.codec_handle = iscz1_start(); + reg->sortKeys.buf = 0; reg->sortKeys.buf_max = 0; @@ -252,9 +297,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, reg->sortIdx = 0; reg->isams = 0; reg->matchDict = 0; - reg->isam = 0; reg->isamc = 0; - reg->isamd = 0; reg->isamb = 0; reg->zei = 0; reg->matchDict = 0; @@ -263,7 +306,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, zebraRankInstall (reg, rank1_class); zebraRankInstall (reg, rankzv_class); - zebraRankInstall (reg, rankliv_class); recordCompression = res_get_def (res, "recordCompression", "none"); if (!strcmp (recordCompression, "none")) @@ -273,21 +315,21 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->records = rec_open (reg->bfs, rw, record_compression))) { - logf (LOG_WARN, "rec_open"); + yaz_log (YLOG_WARN, "rec_open failed"); return 0; } if (rw) { - reg->matchDict = dict_open (reg->bfs, GMATCH_DICT, 20, 1, 0); + reg->matchDict = dict_open_res (reg->bfs, GMATCH_DICT, 20, 1, 0, res); } - if (!(reg->dict = dict_open (reg->bfs, FNAME_DICT, 40, rw, 0))) + if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res))) { - logf (LOG_WARN, "dict_open"); + yaz_log (YLOG_WARN, "dict_open failed"); return 0; } if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw))) { - logf (LOG_WARN, "sortIdx_open"); + yaz_log (YLOG_WARN, "sortIdx_open failed"); return 0; } if (res_get_match (res, "isam", "s", ISAM_DEFAULT)) @@ -296,16 +338,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isams = isams_open (reg->bfs, FNAME_ISAMS, rw, key_isams_m(res, &isams_m)))) { - logf (LOG_WARN, "isams_open"); - return 0; - } - } - if (res_get_match (res, "isam", "i", ISAM_DEFAULT)) - { - if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw, - sizeof (struct it_key), res))) - { - logf (LOG_WARN, "is_open"); + yaz_log (YLOG_WARN, "isams_open failed"); return 0; } } @@ -315,18 +348,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC, rw, key_isamc_m(res, &isamc_m)))) { - logf (LOG_WARN, "isc_open"); - return 0; - } - } - if (res_get_match (res, "isam", "d", ISAM_DEFAULT)) - { - struct ISAMD_M_s isamd_m; - - if (!(reg->isamd = isamd_open (reg->bfs, FNAME_ISAMD, - rw, key_isamd_m(res, &isamd_m)))) - { - logf (LOG_WARN, "isamd_open"); + yaz_log (YLOG_WARN, "isc_open failed"); return 0; } } @@ -337,7 +359,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamb = isamb_open (reg->bfs, "isamb", rw, key_isamc_m(res, &isamc_m), 0))) { - logf (LOG_WARN, "isamb_open"); + yaz_log (YLOG_WARN, "isamb_open failed"); return 0; } } @@ -348,7 +370,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamb = isamb_open (reg->bfs, "isamb", rw, key_isamc_m(res, &isamc_m), 1))) { - logf (LOG_WARN, "isamb_open"); + yaz_log (YLOG_WARN, "isamb_open failed"); return 0; } } @@ -359,7 +381,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamb = isamb_open (reg->bfs, "isamb", rw, key_isamc_m(res, &isamc_m), -1))) { - logf (LOG_WARN, "isamb_open"); + yaz_log (YLOG_WARN, "isamb_open failed"); return 0; } } @@ -368,18 +390,18 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, explain_extract); if (!reg->zei) { - logf (LOG_WARN, "Cannot obtain EXPLAIN information"); + yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information"); return 0; } reg->active = 2; - yaz_log (LOG_DEBUG, "zebra_register_open ok p=%p", reg); + yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg); return reg; } int zebra_admin_shutdown (ZebraHandle zh) { ASSERTZH; - yaz_log(LOG_API,"zebra_admin_shutdown"); + yaz_log(log_level,"zebra_admin_shutdown"); zh->errCode=0; zebra_mutex_cond_lock (&zh->service->session_lock); @@ -392,7 +414,7 @@ int zebra_admin_start (ZebraHandle zh) { ZebraService zs; ASSERTZH; - yaz_log(LOG_API,"zebra_admin_start"); + yaz_log(log_level,"zebra_admin_start"); zh->errCode=0; zs = zh->service; zebra_mutex_cond_lock (&zs->session_lock); @@ -403,7 +425,8 @@ int zebra_admin_start (ZebraHandle zh) static void zebra_register_close (ZebraService zs, struct zebra_register *reg) { ASSERTZS; - yaz_log(LOG_LOG|LOG_API, "zebra_register_close p=%p", reg); + assert(reg); + yaz_log(YLOG_DEBUG, "zebra_register_close p=%p", reg); reg->stop_flag = 0; zebra_chdir (zs); if (reg->records) @@ -415,12 +438,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) sortIdx_close (reg->sortIdx); if (reg->isams) isams_close (reg->isams); - if (reg->isam) - is_close (reg->isam); if (reg->isamc) isc_close (reg->isamc); - if (reg->isamd) - isamd_close (reg->isamd); if (reg->isamb) isamb_close (reg->isamb); rec_close (®->records); @@ -434,7 +453,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) xfree (reg->sortKeys.buf); xfree (reg->keys.buf); - + if (reg->keys.codec_handle) + iscz1_stop(reg->keys.codec_handle); xfree (reg->key_buf); xfree (reg->name); xfree (reg); @@ -444,7 +464,7 @@ int zebra_stop(ZebraService zs) { if (!zs) return 0; - yaz_log (LOG_LOG|LOG_API, "zebra_stop"); + yaz_log (log_level, "zebra_stop"); while (zs->sessions) { @@ -456,6 +476,8 @@ int zebra_stop(ZebraService zs) if (zs->passwd_db) passwd_db_close (zs->passwd_db); + recTypeClass_destroy(zs->record_classes); + nmem_destroy(zs->nmem); res_close (zs->global_res); xfree (zs->configName); xfree (zs); @@ -468,14 +490,14 @@ int zebra_close (ZebraHandle zh) struct zebra_session **sp; int i; - yaz_log(LOG_API,"zebra_close"); + yaz_log(log_level,"zebra_close"); if (!zh) return 0; ASSERTZH; zh->errCode=0; zs = zh->service; - yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh); + yaz_log (YLOG_DEBUG, "zebra_close zh=%p", zh); resultSetDestroy (zh, -1, 0, 0); if (zh->reg) @@ -546,7 +568,7 @@ static Res zebra_open_res (ZebraHandle zh) } else { - yaz_log (LOG_WARN, "no register root specified"); + yaz_log (YLOG_WARN, "no register root specified"); return 0; /* no path for register - fail! */ } return res; @@ -632,6 +654,10 @@ void map_basenames_func (void *vp, const char *name, const char *value) struct map_baseinfo *p = (struct map_baseinfo *) vp; int i, no; char fromdb[128], todb[8][128]; + + assert(value); + assert(name); + assert(vp); no = sscanf (value, "%127s %127s %127s %127s %127s %127s %127s %127s %127s", @@ -662,7 +688,9 @@ void map_basenames (ZebraHandle zh, ODR stream, struct map_baseinfo *p = &info; int i; ASSERTZH; - yaz_log(LOG_API,"map_basenames "); + yaz_log(log_level,"map_basenames "); + assert(stream); + zh->errCode=0; info.zh = zh; @@ -685,13 +713,14 @@ void map_basenames (ZebraHandle zh, ODR stream, *num_bases = info.new_num_bases; *basenames = info.new_basenames; for (i = 0; i<*num_bases; i++) - logf (LOG_LOG, "base %s", (*basenames)[i]); + yaz_log (YLOG_DEBUG, "base %s", (*basenames)[i]); } int zebra_select_database (ZebraHandle zh, const char *basename) { ASSERTZH; - yaz_log(LOG_API,"zebra_select_database %s",basename); + yaz_log(log_level,"zebra_select_database %s",basename); + assert(basename); zh->errCode=0; return zebra_select_databases (zh, 1, &basename); } @@ -704,7 +733,9 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, int len = 0; char *new_reg = 0; ASSERTZH; - yaz_log(LOG_API,"zebra_select_databases n=%d [0]=%s", + assert(basenames); + + yaz_log(log_level,"zebra_select_databases n=%d [0]=%s", num_bases,basenames[0]); zh->errCode=0; @@ -778,8 +809,14 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, int zebra_search_RPN (ZebraHandle zh, ODR o, Z_RPNQuery *query, const char *setname, int *hits) { + const char *max; + zint maxhits; ASSERTZH; - yaz_log(LOG_API,"zebra_search_rpn"); + assert(o); + assert(query); + assert(hits); + assert(setname); + yaz_log(log_level,"zebra_search_rpn"); zh->errCode=0; zh->hits = 0; *hits = 0; @@ -787,32 +824,49 @@ int zebra_search_RPN (ZebraHandle zh, ODR o, if (zebra_begin_read (zh)) return 1; - zebra_livcode_transform(zh, query); - resultSetAddRPN (zh, odr_extract_mem(o), query, zh->num_basenames, zh->basenames, setname); zebra_end_read (zh); - - *hits = zh->hits; + max = res_get (zh->res, "maxhits"); + if (max) + maxhits=atoi(max); + else { + int i=0; + maxhits=INT_MAX; /* properly rounded, to make it look like a limit*/ + while (maxhits>100) { maxhits/=10; i++;} + while (i--) maxhits *= 10; + } + if (zh->hits > maxhits) { /* too large for yaz to handle */ + yaz_log(YLOG_DEBUG,"limiting hits to "ZINT_FORMAT, maxhits); + *hits=maxhits; + } + else + *hits = zh->hits; return 0; } int zebra_records_retrieve (ZebraHandle zh, ODR stream, - const char *setname, Z_RecordComposition *comp, - oid_value input_format, int num_recs, - ZebraRetrievalRecord *recs) + const char *setname, Z_RecordComposition *comp, + oid_value input_format, int num_recs, + ZebraRetrievalRecord *recs) { - ZebraPosSet poset; - int i, *pos_array, ret = 0; + ZebraMetaRecord *poset; + int i, ret = 0; + zint *pos_array; ASSERTZH; - yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs); + assert(stream); + assert(setname); + assert(recs); + assert(num_recs>0); + + yaz_log(log_level,"zebra_records_retrieve n=%d",num_recs); zh->errCode=0; if (!zh->res) { zh->errCode = 30; - zh->errString = odr_strdup (stream, setname); + zh->errString = odr_strdup(stream, setname); return -1; } @@ -821,13 +875,13 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream, if (zebra_begin_read (zh)) return -1; - pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); + pos_array = (zint *) xmalloc(num_recs * sizeof(*pos_array)); for (i = 0; ierrCode = 30; zh->errString = nmem_strdup (stream->mem, setname); ret = -1; @@ -846,26 +900,36 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream, } else if (poset[i].sysno) { + char *buf; + int len; recs[i].errCode = zebra_record_fetch (zh, poset[i].sysno, poset[i].score, stream, input_format, comp, - &recs[i].format, &recs[i].buf, - &recs[i].len, - &recs[i].base); - recs[i].errString = NULL; + &recs[i].format, &buf, &len, + &recs[i].base, &recs[i].errString); + recs[i].len = len; + if (len > 0) + { + recs[i].buf = (char*) odr_malloc(stream, len); + memcpy(recs[i].buf, buf, len); + } + else + recs[i].buf = buf; + recs[i].score=poset[i].score; + recs[i].sysno=poset[i].sysno; } else { char num_str[20]; - sprintf (num_str, "%d", pos_array[i]); + sprintf (num_str, ZINT_FORMAT, pos_array[i]); zh->errCode = 13; zh->errString = odr_strdup (stream, num_str); ret = -1; break; } } - zebraPosSetDestroy (zh, poset, num_recs); + zebra_meta_records_destroy(zh, poset, num_recs); } zebra_end_read (zh); xfree (pos_array); @@ -878,7 +942,13 @@ int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int *is_partial) { ASSERTZH; - yaz_log(LOG_API,"zebra_scan"); + assert(stream); + assert(zapt); + assert(position); + assert(num_entries); + assert(is_partial); + assert(entries); + yaz_log(log_level,"zebra_scan"); zh->errCode=0; if (zebra_begin_read (zh)) { @@ -899,7 +969,12 @@ int zebra_sort (ZebraHandle zh, ODR stream, int *sort_status) { ASSERTZH; - yaz_log(LOG_API,"zebra_sort"); + assert(stream); + assert(num_input_setnames>0); + assert(input_setnames); + assert(sort_sequence); + assert(sort_status); + yaz_log(log_level,"zebra_sort"); zh->errCode=0; if (zebra_begin_read (zh)) return 1; @@ -915,16 +990,19 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, { int i, status; ASSERTZH; - yaz_log(LOG_API,"zebra_deleleResultSet n=%d",num_setnames); + assert(num_setnames>0); + assert(setnames); + assert(statuses); + yaz_log(log_level,"zebra_deleleResultSet n=%d",num_setnames); zh->errCode=0; if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; switch (function) { - case Z_DeleteRequest_list: + case Z_DeleteResultSetRequest_list: resultSetDestroy (zh, num_setnames, setnames, statuses); break; - case Z_DeleteRequest_all: + case Z_DeleteResultSetRequest_all: resultSetDestroy (zh, -1, 0, statuses); break; } @@ -940,10 +1018,10 @@ int zebra_errCode (ZebraHandle zh) { if (zh) { - yaz_log(LOG_API,"zebra_errCode: %d",zh->errCode); + yaz_log(log_level,"zebra_errCode: %d",zh->errCode); return zh->errCode; } - yaz_log(LOG_API,"zebra_errCode: o"); + yaz_log(log_level,"zebra_errCode: o"); return 0; } @@ -952,7 +1030,7 @@ const char *zebra_errString (ZebraHandle zh) const char *e=""; if (zh) e= diagbib1_str (zh->errCode); - yaz_log(LOG_API,"zebra_errString: %s",e); + yaz_log(log_level,"zebra_errString: %s",e); return e; } @@ -961,7 +1039,7 @@ char *zebra_errAdd (ZebraHandle zh) char *a=""; if (zh) a= zh->errString; - yaz_log(LOG_API,"zebra_errAdd: %s",a); + yaz_log(log_level,"zebra_errAdd: %s",a); return a; } @@ -1002,7 +1080,7 @@ int zebra_admin_import_begin (ZebraHandle zh, const char *database, const char *record_type) { ASSERTZH; - yaz_log(LOG_API,"zebra_admin_import_begin db=%s rt=%s", + yaz_log(log_level,"zebra_admin_import_begin db=%s rt=%s", database, record_type); zh->errCode=0; if (zebra_select_database(zh, database)) @@ -1015,7 +1093,7 @@ int zebra_admin_import_begin (ZebraHandle zh, const char *database, int zebra_admin_import_end (ZebraHandle zh) { ASSERTZH; - yaz_log(LOG_API,"zebra_admin_import_end"); + yaz_log(log_level,"zebra_admin_import_end"); zh->errCode=0; zebra_end_trans (zh); return 0; @@ -1023,16 +1101,17 @@ int zebra_admin_import_end (ZebraHandle zh) int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { - int sysno; + SYSNO sysno; int i; ASSERTZH; - yaz_log(LOG_API,"zebra_admin_import_segment"); + yaz_log(log_level,"zebra_admin_import_segment"); zh->errCode=0; for (i = 0; inum_segmentRecords; i++) { Z_NamePlusRecord *npr = segment->segmentRecords[i]; printf ("--------------%d--------------------\n", i); + /* FIXME - What! printing on stdout ??? */ if (npr->which == Z_NamePlusRecord_intermediateFragment) { Z_FragmentSyntax *fragment = npr->u.intermediateFragment; @@ -1067,11 +1146,14 @@ int zebra_admin_exchange_record (ZebraHandle zh, /* 3 = delete. Fail if does not exist */ /* 4 = update. Insert/replace */ { - int sysno = 0; + SYSNO sysno = 0; char *rinfo = 0; char recid_z[256]; ASSERTZH; - yaz_log(LOG_API,"zebra_admin_exchange_record ac=%d", action); + assert(action>0 && action <=4); + assert(rec_buf); + + yaz_log(log_level,"zebra_admin_exchange_record ac=%d", action); zh->errCode=0; if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) @@ -1128,6 +1210,7 @@ int delete_w_handle(const char *info, void *handle) { ZebraHandle zh = (ZebraHandle) handle; ISAMC_P pos; + ASSERTZH; if (*info == sizeof(pos)) { @@ -1156,7 +1239,7 @@ int zebra_drop_database (ZebraHandle zh, const char *database) { int ret = 0; ASSERTZH; - yaz_log(LOG_API,"zebra_drop_database"); + yaz_log(log_level,"zebra_drop_database"); zh->errCode = 0; if (zebra_select_database (zh, database)) @@ -1172,7 +1255,7 @@ int zebra_drop_database (ZebraHandle zh, const char *database) } else { - yaz_log(LOG_WARN, "drop database only supported for isam:b"); + yaz_log(YLOG_WARN, "drop database only supported for isam:b"); ret = -1; } zebra_end_trans (zh); @@ -1182,7 +1265,8 @@ int zebra_drop_database (ZebraHandle zh, const char *database) int zebra_create_database (ZebraHandle zh, const char *database) { ASSERTZH; - yaz_log(LOG_API,"zebra_create_database"); + yaz_log(log_level,"zebra_create_database %s",database); + assert(database); zh->errCode=0; if (zebra_select_database (zh, database)) @@ -1209,7 +1293,9 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, { WRBUF wrbuf; ASSERTZH; - yaz_log(LOG_API,"zebra_string_norm "); + assert(input_str); + assert(output_str); + yaz_log(log_level,"zebra_string_norm "); zh->errCode=0; if (!zh->reg->zebra_maps) return -1; @@ -1227,20 +1313,21 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, int zebra_set_state (ZebraHandle zh, int val, int seqno) + /* FIXME - zint seqno ?? */ { char state_fname[256]; char *fname; long p = getpid(); FILE *f; ASSERTZH; - yaz_log(LOG_API,"zebra_set_state v=%d seq=%d", val, seqno); + yaz_log(log_level,"zebra_set_state v=%d seq=%d", val, seqno); 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, "w"); - yaz_log (LOG_DEBUG, "%c %d %ld", val, seqno, p); + yaz_log (YLOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p); fprintf (f, "%c %d %ld\n", val, seqno, p); fclose (f); xfree (fname); @@ -1254,7 +1341,7 @@ int zebra_get_state (ZebraHandle zh, char *val, int *seqno) FILE *f; ASSERTZH; - yaz_log(LOG_API,"zebra_get_state "); + yaz_log(log_level,"zebra_get_state "); zh->errCode=0; sprintf (state_fname, "state.%s.LCK", zh->reg_name); fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); @@ -1285,6 +1372,7 @@ static void read_res_for_transaction(ZebraHandle zh) { const char *group = res_get(zh->res, "group"); const char *v; + /* FIXME - do we still use groups ?? */ zh->m_group = group; v = res_get_prefix(zh->res, "followLinks", group, "1"); @@ -1311,6 +1399,7 @@ static void read_res_for_transaction(ZebraHandle zh) int zebra_begin_trans (ZebraHandle zh, int rw) { + ASSERTZH; if (!zh->res) { zh->errCode = 2; @@ -1318,7 +1407,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw) return -1; } ASSERTZHRES; - yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw); + yaz_log(log_level,"zebra_begin_trans rw=%d",rw); if (zh->user_perm) { @@ -1340,7 +1429,10 @@ int zebra_begin_trans (ZebraHandle zh, int rw) (zh->trans_no++); if (zh->trans_w_no) + { + read_res_for_transaction(zh); return 0; + } if (zh->trans_no != 1) { zh->errCode = 2; @@ -1384,7 +1476,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw) zebra_get_state (zh, &val, &seqno); if (val == 'c') { - yaz_log (LOG_LOG, "previous transaction didn't finish commit"); + yaz_log (YLOG_WARN, "previous transaction didn't finish commit"); zebra_unlock (zh->lock_shadow); zebra_unlock (zh->lock_normal); zebra_commit (zh); @@ -1396,20 +1488,20 @@ int zebra_begin_trans (ZebraHandle zh, int rw) { BFiles bfs = bfs_create (res_get (zh->res, "shadow"), zh->path_reg); - yaz_log (LOG_LOG, "previous transaction didn't reach commit"); + yaz_log (YLOG_WARN, "previous transaction didn't reach commit"); bf_commitClean (bfs, rval); bfs_destroy (bfs); } else { - yaz_log (LOG_WARN, "your previous transaction didn't finish"); + yaz_log (YLOG_WARN, "your previous transaction didn't finish"); } } break; } if (pass == 2) { - yaz_log (LOG_FATAL, "zebra_begin_trans couldn't finish commit"); + yaz_log (YLOG_FATAL, "zebra_begin_trans couldn't finish commit"); abort(); return -1; } @@ -1432,7 +1524,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw) zh->errCode = 2; zh->errString = "zebra_begin_trans: cannot open register"; - yaz_log(LOG_FATAL, zh->errString); + yaz_log(YLOG_FATAL, zh->errString); return -1; } } @@ -1473,13 +1565,13 @@ int zebra_begin_trans (ZebraHandle zh, int rw) dirty = 1; else if (seqno != zh->reg->seqno) { - yaz_log (LOG_LOG, "reopen seqno cur/old %d/%d", + yaz_log (YLOG_DEBUG, "reopen seqno cur/old %d/%d", seqno, zh->reg->seqno); dirty = 1; } else if (zh->reg->last_val != val) { - yaz_log (LOG_LOG, "reopen last cur/old %d/%d", + yaz_log (YLOG_DEBUG, "reopen last cur/old %d/%d", val, zh->reg->last_val); dirty = 1; } @@ -1517,7 +1609,8 @@ int zebra_begin_trans (ZebraHandle zh, int rw) int zebra_end_trans (ZebraHandle zh) { ZebraTransactionStatus dummy; - yaz_log(LOG_API,"zebra_end_trans"); + ASSERTZH; + yaz_log(log_level,"zebra_end_trans"); return zebra_end_transaction(zh, &dummy); } @@ -1528,7 +1621,8 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) const char *rval; ASSERTZH; - yaz_log(LOG_API,"zebra_end_transaction"); + assert(status); + yaz_log(log_level,"zebra_end_transaction"); status->processed = 0; status->inserted = 0; @@ -1559,7 +1653,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) zh->trans_no--; zh->trans_w_no = 0; - yaz_log (LOG_LOG, "zebra_end_trans"); + yaz_log (YLOG_DEBUG, "zebra_end_trans"); rval = res_get (zh->res, "shadow"); zebraExplain_runNumberIncrement (zh->reg->zei, 1); @@ -1571,7 +1665,8 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) zebra_register_close (zh->service, zh->reg); zh->reg = 0; - yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d", + yaz_log (YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d " + ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, zh->records_processed, zh->records_inserted, zh->records_updated, zh->records_deleted); @@ -1584,7 +1679,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) if (val != 'd') { BFiles bfs = bfs_create (rval, zh->path_reg); - yaz_log (LOG_LOG, "deleting shadow stuff val=%c", val); + yaz_log (YLOG_DEBUG, "deleting shadow val=%c", val); bf_commitClean (bfs, rval); bfs_destroy (bfs); } @@ -1598,7 +1693,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) } #if HAVE_SYS_TIMES_H times (&zh->tms2); - logf (LOG_LOG, "user/system: %ld/%ld", + yaz_log (log_level, "user/system: %ld/%ld", (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); @@ -1611,8 +1706,9 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) int zebra_repository_update (ZebraHandle zh, const char *path) { ASSERTZH; + assert(path); zh->errCode=0; - logf (LOG_LOG|LOG_API, "updating %s", path); + yaz_log (log_level, "updating %s", path); repositoryUpdate (zh, path); return zh->errCode; } @@ -1620,8 +1716,9 @@ int zebra_repository_update (ZebraHandle zh, const char *path) int zebra_repository_delete (ZebraHandle zh, const char *path) { ASSERTZH; + assert(path); zh->errCode=0; - logf (LOG_LOG|LOG_API, "deleting %s", path); + yaz_log (log_level, "deleting %s", path); repositoryDelete (zh, path); return zh->errCode; } @@ -1629,7 +1726,8 @@ int zebra_repository_delete (ZebraHandle zh, const char *path) int zebra_repository_show (ZebraHandle zh, const char *path) { ASSERTZH; - yaz_log(LOG_API,"zebra_repository_show"); + assert(path); + yaz_log(log_level,"zebra_repository_show"); zh->errCode=0; repositoryShow (zh, path); return zh->errCode; @@ -1652,8 +1750,7 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only) rval = res_get (zh->res, "shadow"); if (!rval) { - logf (LOG_WARN, "Cannot perform commit"); - logf (LOG_WARN, "No shadow area defined"); + yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined"); return 0; } @@ -1674,20 +1771,20 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only) { zebra_set_state (zh, 'c', seqno); - logf (LOG_LOG, "commit start"); + yaz_log (YLOG_DEBUG, "commit start"); bf_commitExec (bfs); #ifndef WIN32 sync (); #endif } - logf (LOG_LOG, "commit clean"); + yaz_log (YLOG_DEBUG, "commit clean"); bf_commitClean (bfs, rval); seqno++; zebra_set_state (zh, 'o', seqno); } else { - logf (LOG_LOG, "nothing to commit"); + yaz_log (log_level, "nothing to commit"); } bfs_destroy (bfs); @@ -1698,13 +1795,15 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only) int zebra_clean (ZebraHandle zh) { - yaz_log(LOG_API,"zebra_clean"); + ASSERTZH; + yaz_log(log_level,"zebra_clean"); return zebra_commit_ex(zh, 1); } int zebra_commit (ZebraHandle zh) { - yaz_log(LOG_API,"zebra_commit"); + ASSERTZH; + yaz_log(log_level,"zebra_commit"); return zebra_commit_ex(zh, 0); } @@ -1713,7 +1812,7 @@ int zebra_init (ZebraHandle zh) const char *rval; BFiles bfs = 0; ASSERTZH; - yaz_log(LOG_API,"zebra_init"); + yaz_log(log_level,"zebra_init"); zh->errCode=0; if (!zh->res) @@ -1725,6 +1824,8 @@ int zebra_init (ZebraHandle zh) bfs = bfs_create (res_get (zh->service->global_res, "register"), zh->path_reg); + if (!bfs) + return -1; if (rval && *rval) bf_cache (bfs, rval); @@ -1738,7 +1839,7 @@ int zebra_compact (ZebraHandle zh) { BFiles bfs; ASSERTZH; - yaz_log(LOG_API,"zebra_compact"); + yaz_log(log_level,"zebra_compact"); zh->errCode=0; if (!zh->res) { @@ -1754,7 +1855,7 @@ int zebra_compact (ZebraHandle zh) int zebra_result (ZebraHandle zh, int *code, char **addinfo) { ASSERTZH; - yaz_log(LOG_API,"zebra_result"); + yaz_log(log_level,"zebra_result"); *code = zh->errCode; *addinfo = zh->errString; return 0; @@ -1763,49 +1864,54 @@ int zebra_result (ZebraHandle zh, int *code, char **addinfo) int zebra_shadow_enable (ZebraHandle zh, int value) { ASSERTZH; - yaz_log(LOG_API,"zebra_shadow_enable"); + yaz_log(log_level,"zebra_shadow_enable"); zh->errCode=0; zh->shadow_enable = value; return 0; } -int zebra_record_encoding (ZebraHandle zh, const char *encoding) +int zebra_octet_term_encoding(ZebraHandle zh, const char *encoding) { ASSERTZH; - yaz_log(LOG_API,"zebra_record_encoding"); - zh->errCode=0; - xfree (zh->record_encoding); - - /* - * Fixme! - * Something about charset aliases. Oleg??? - */ + assert(encoding); + yaz_log(log_level,"zebra_octet_term_encoding"); + zh->errCode = 0; 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); + yaz_log (YLOG_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); + yaz_log (YLOG_WARN, "iconv: UTF-8 to %s unsupported", encoding); return 0; } +int zebra_record_encoding (ZebraHandle zh, const char *encoding) +{ + ASSERTZH; + yaz_log(log_level,"zebra_record_encoding"); + zh->errCode = 0; + xfree (zh->record_encoding); + zh->record_encoding = 0; + if (encoding) + zh->record_encoding = xstrdup (encoding); + return 0; +} + int zebra_set_resource(ZebraHandle zh, const char *name, const char *value) { ASSERTZH; - yaz_log(LOG_API,"zebra_set_resource %s:%s",name,value); + assert(name); + assert(value); + yaz_log(log_level,"zebra_set_resource %s:%s",name,value); zh->errCode=0; res_set(zh->res, name, value); return 0; @@ -1816,9 +1922,11 @@ const char *zebra_get_resource(ZebraHandle zh, { const char *v; ASSERTZH; + assert(name); + assert(defaultvalue); v= res_get_def( zh->res, name, (char *)defaultvalue); zh->errCode=0; - yaz_log(LOG_API,"zebra_get_resource %s:%s",name,v); + yaz_log(log_level,"zebra_get_resource %s:%s",name,v); return v; } @@ -1828,105 +1936,36 @@ const char *zebra_get_resource(ZebraHandle zh, int zebra_trans_no (ZebraHandle zh) { ASSERTZH; - yaz_log(LOG_API,"zebra_trans_no"); + yaz_log(log_level,"zebra_trans_no"); return zh->trans_no; } int zebra_get_shadow_enable (ZebraHandle zh) { - yaz_log(LOG_API,"zebra_get_shadow_enable"); + ASSERTZH; + yaz_log(log_level,"zebra_get_shadow_enable"); return (zh->shadow_enable); } int zebra_set_shadow_enable (ZebraHandle zh, int value) { - yaz_log(LOG_API,"zebra_set_shadow_enable %d",value); + ASSERTZH; + yaz_log(log_level,"zebra_set_shadow_enable %d",value); zh->shadow_enable = value; return 0; } -/* almost the same as zebra_records_retrieve ... but how did it work? - I mean for multiple records ??? CHECK ??? */ +/* 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) { - ZebraPosSet poset; - int i, *pos_array; - yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs); - - if (!zh->res) - { - zh->errCode = 30; - zh->errString = odr_strdup (stream, setname); - return; - } - - zh->errCode = 0; - - if (zebra_begin_read (zh)) - return; - - pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); - for (i = 0; ierrCode = 30; - zh->errString = nmem_strdup (stream->mem, setname); - } - else - { - for (i = 0; ierrCode = 13; - zh->errString = odr_strdup (stream, num_str); - break; - } - - } - zebraPosSetDestroy (zh, poset, num_recs); - } - zebra_end_read (zh); - xfree (pos_array); + zebra_records_retrieve(zh, stream, setname, comp, input_format, + num_recs, recs); } - /* --------------------------------------------------------------------------- Record insert(=update), delete @@ -1940,17 +1979,20 @@ 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) { - int sysno = 0; + SYSNO sysno = 0; return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0); } int zebra_insert_record (ZebraHandle zh, const char *recordType, - int *sysno, const char *match, const char *fname, - const char *buf, int buf_size) + SYSNO *sysno, const char *match, const char *fname, + const char *buf, int buf_size, int force_update) { int res; - yaz_log(LOG_API,"zebra_insert_record sysno=%d", *sysno); + ASSERTZH; + assert(sysno); + assert(buf); + yaz_log(log_level, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno); if (buf_size < 1) buf_size = strlen(buf); @@ -1970,13 +2012,16 @@ int zebra_insert_record (ZebraHandle zh, int zebra_update_record (ZebraHandle zh, const char *recordType, - int* sysno, const char *match, const char *fname, + SYSNO* sysno, const char *match, const char *fname, const char *buf, int buf_size, int force_update) { int res; + ASSERTZH; + assert(sysno); + assert(buf); - yaz_log(LOG_API,"zebra_update_record sysno=%d", *sysno); + yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, *sysno); if (buf_size < 1) buf_size = strlen(buf); @@ -1996,12 +2041,15 @@ int zebra_update_record (ZebraHandle zh, int zebra_delete_record (ZebraHandle zh, const char *recordType, - int *sysno, const char *match, const char *fname, + SYSNO *sysno, const char *match, const char *fname, const char *buf, int buf_size, int force_update) { int res; - yaz_log(LOG_API,"zebra_delete_record sysno=%d", *sysno); + ASSERTZH; + assert(sysno); + assert(buf); + yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno); if (buf_size < 1) buf_size = strlen(buf); @@ -2030,19 +2078,22 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query, int res=-1; Z_RPNQuery *query; ODR odr = odr_createmem(ODR_ENCODE); + ASSERTZH; + assert(pqf_query); + assert(setname); - yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, pqf_query); + yaz_log(log_level,"zebra_search_PQF s=%s q=%s",setname, pqf_query); query = p_query_rpn (odr, PROTO_Z3950, pqf_query); if (!query) - yaz_log (LOG_WARN, "bad query %s\n", pqf_query); + yaz_log (YLOG_WARN, "bad query %s\n", pqf_query); else res=zebra_search_RPN (zh, odr, query, setname, &hits); odr_destroy(odr); - yaz_log(LOG_API,"Hits: %d",hits); + yaz_log(log_level,"Hits: %d",hits); if (numhits) *numhits=hits; @@ -2052,7 +2103,6 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query, /* --------------------------------------------------------------------------- Sort - a simplified interface, with optional read locks. - FIXME - This is a horrible name, will conflict with half the applications */ int zebra_sort_by_specstr (ZebraHandle zh, ODR stream, @@ -2062,11 +2112,17 @@ int zebra_sort_by_specstr (ZebraHandle zh, { int num_input_setnames = 0; int sort_status = 0; - Z_SortKeySpecList *sort_sequence = yaz_sort_spec (stream, sort_spec); - yaz_log(LOG_API,"sort (FIXME) "); + Z_SortKeySpecList *sort_sequence; + ASSERTZH; + assert(stream); + assert(sort_spec); + assert(output_setname); + assert(input_setnames); + sort_sequence = yaz_sort_spec (stream, sort_spec); + yaz_log(log_level,"sort (FIXME) "); if (!sort_sequence) { - logf(LOG_WARN,"invalid sort specs '%s'", sort_spec); + yaz_log(YLOG_WARN,"invalid sort specs '%s'", sort_spec); zh->errCode = 207; return -1; } @@ -2084,3 +2140,4 @@ int zebra_sort_by_specstr (ZebraHandle zh, zebra_end_read(zh); return sort_status; } +