X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=a740d5738291772174eed5794ad3dce789e7ab7c;hb=28f3461a79a4569d736f4ffc66c6ae207e38c2ab;hp=8120ebe667c54bebfe52e60cb0c06e5261488082;hpb=4ed5fbcd29d2a98b048d1d94510b262d352b4f7c;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 8120ebe..a740d57 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -4,7 +4,33 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraapi.c,v $ - * Revision 1.18 1999-05-15 14:36:38 adam + * Revision 1.26 1999-11-30 13:48:03 adam + * Improved installation. Updated for inclusion of YAZ header files. + * + * Revision 1.25 1999/11/04 15:00:45 adam + * Implemented delete result set(s). + * + * Revision 1.24 1999/10/14 14:33:50 adam + * Added truncation 5=106. + * + * Revision 1.23 1999/09/07 11:36:32 adam + * Minor changes. + * + * Revision 1.22 1999/08/02 10:13:47 adam + * Fixed bug regarding zebra_hits. + * + * Revision 1.21 1999/07/14 10:59:26 adam + * Changed functions isc_getmethod, isams_getmethod. + * Improved fatal error handling (such as missing EXPLAIN schema). + * + * Revision 1.20 1999/07/06 12:28:04 adam + * Updated record index structure. Format includes version ID. Compression + * algorithm ID is stored for each record block. + * + * Revision 1.19 1999/05/26 07:49:13 adam + * C++ compilation. + * + * Revision 1.18 1999/05/15 14:36:38 adam * Updated dictionary. Implemented "compression" of dictionary. * * Revision 1.17 1999/05/12 13:08:06 adam @@ -76,7 +102,7 @@ #include #endif -#include +#include #include "zserver.h" static void zebra_chdir (ZebraHandle zh) @@ -91,11 +117,17 @@ static void zebra_chdir (ZebraHandle zh) chdir (dir); #endif } + +static void zebra_register_unlock (ZebraHandle zh); + static int zebra_register_lock (ZebraHandle zh) { time_t lastChange; int state; + zh->errCode = 0; + zh->errString = 0; + zebra_chdir (zh); state = zebra_server_lock_get_state(zh, &lastChange); @@ -109,7 +141,7 @@ static int zebra_register_lock (ZebraHandle zh) state = 0; } zebra_server_lock (zh, state); -#if USE_TIMES +#if HAVE_SYS_TIMES_H times (&zh->tms1); #endif if (zh->registerState == state) @@ -128,59 +160,93 @@ static int zebra_register_lock (ZebraHandle zh) if (zh->records) { zebraExplain_close (zh->zei, 0, 0); - dict_close (zh->dict); - sortIdx_close (zh->sortIdx); + if (zh->dict) + dict_close (zh->dict); + if (zh->sortIdx) + sortIdx_close (zh->sortIdx); + if (zh->isams) + isams_close (zh->isams); +#if ZMBOL if (zh->isam) is_close (zh->isam); if (zh->isamc) isc_close (zh->isamc); +#endif rec_close (&zh->records); } bf_cache (zh->bfs, state ? res_get (zh->res, "shadow") : NULL); zh->registerState = state; - zh->records = rec_open (zh->bfs, 0); - if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0, 0))) - { - logf (LOG_WARN, "dict_open"); - return -1; - } - if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0))) - { - logf (LOG_WARN, "sortIdx_open"); - return -1; - } + + zh->isams = NULL; +#if ZMBOL zh->isam = NULL; zh->isamc = NULL; - zh->isams = NULL; - if (res_get_match (zh->res, "isam", "i", NULL)) +#endif + zh->dict = NULL; + zh->sortIdx = NULL; + zh->zei = NULL; + + if (!(zh->records = rec_open (zh->bfs, 0, 0))) { - if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0, - sizeof (struct it_key), zh->res))) - { - logf (LOG_WARN, "is_open"); - return -1; - } + logf (LOG_WARN, "rec_open"); + zh->errCode = 2; } - else if (res_get_match (zh->res, "isam", "s", NULL)) + else { - if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, 0, - key_isams_m(zh->res)))) + if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0, 0))) { - logf (LOG_WARN, "isams_open"); - return -1; + logf (LOG_WARN, "dict_open"); + zh->errCode = 2; } - } - else - { - if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC, - 0, key_isamc_m(zh->res)))) + if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0))) + { + logf (LOG_WARN, "sortIdx_open"); + zh->errCode = 2; + } + if (res_get_match (zh->res, "isam", "s", ISAM_DEFAULT)) + { + struct ISAMS_M_s isams_m; + if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, 0, + key_isams_m(zh->res, &isams_m)))) + { + logf (LOG_WARN, "isams_open"); + zh->errCode = 2; + } + } +#if ZMBOL + else if (res_get_match (zh->res, "isam", "i", ISAM_DEFAULT)) { - logf (LOG_WARN, "isc_open"); - return -1; + if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0, + sizeof (struct it_key), zh->res))) + { + logf (LOG_WARN, "is_open"); + zh->errCode = 2; + } + } + else if (res_get_match (zh->res, "isam", "c", ISAM_DEFAULT)) + { + struct ISAMC_M_s isamc_m; + if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC, + 0, key_isamc_m(zh->res, &isamc_m)))) + { + logf (LOG_WARN, "isc_open"); + zh->errCode = 2; + } + } +#endif + zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0); + if (!zh->zei) + { + logf (LOG_WARN, "Cannot obtain EXPLAIN information"); + zh->errCode = 2; } } - zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0); - + if (zh->errCode) + { + zebra_register_unlock (zh); + zh->registerState = -1; + return -1; + } return 0; } @@ -188,7 +254,7 @@ static void zebra_register_unlock (ZebraHandle zh) { static int waitSec = -1; -#if USE_TIMES +#if HAVE_SYS_TIMES_H times (&zh->tms2); logf (LOG_LOG, "user/system: %ld/%ld", (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), @@ -213,8 +279,9 @@ static void zebra_register_unlock (ZebraHandle zh) ZebraHandle zebra_open (const char *configName) { - ZebraHandle zh = xmalloc (sizeof(*zh)); + ZebraHandle zh; + zh = (ZebraHandle) xmalloc (sizeof(*zh)); if (!(zh->res = res_open (configName))) { logf (LOG_WARN, "Failed to read resources `%s'", configName); @@ -223,7 +290,20 @@ ZebraHandle zebra_open (const char *configName) zebra_chdir (zh); zebra_server_lock_init (zh); zh->dh = data1_create (); + if (!zh->dh) + { + zebra_server_lock_destroy (zh); + xfree (zh); + return 0; + } zh->bfs = bfs_create (res_get (zh->res, "register")); + if (!zh->bfs) + { + zebra_server_lock_destroy (zh); + data1_destroy(zh->dh); + xfree (zh); + return 0; + } bf_lockDir (zh->bfs, res_get (zh->res, "lockDir")); data1_set_tabpath (zh->dh, res_get(zh->res, "profilePath")); zh->sets = NULL; @@ -260,16 +340,18 @@ void zebra_close (ZebraHandle zh) zebra_chdir (zh); if (zh->records) { - resultSetDestroy (zh); + resultSetDestroy (zh, -1, 0, 0); zebraExplain_close (zh->zei, 0, 0); dict_close (zh->dict); sortIdx_close (zh->sortIdx); + if (zh->isams) + isams_close (zh->isams); +#if ZMBOL if (zh->isam) is_close (zh->isam); if (zh->isamc) isc_close (zh->isamc); - if (zh->isams) - isams_close (zh->isams); +#endif rec_close (&zh->records); zebra_register_unlock (zh); } @@ -298,7 +380,7 @@ struct map_baseinfo { void map_basenames_func (void *vp, const char *name, const char *value) { - struct map_baseinfo *p = vp; + struct map_baseinfo *p = (struct map_baseinfo *) vp; int i, no; char fromdb[128], todb[8][128]; @@ -358,11 +440,9 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode, Z_RPNQuery *query, int num_bases, char **basenames, const char *setname) { - zebra_register_lock (zh); - zh->errCode = 0; - zh->errString = NULL; zh->hits = 0; - + if (zebra_register_lock (zh)) + return; map_basenames (zh, stream, &num_bases, &basenames); resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname); @@ -377,14 +457,11 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, ZebraPosSet poset; int i, *pos_array; - zh->errCode = 0; - zh->errString = NULL; - pos_array = xmalloc (num_recs * sizeof(*pos_array)); + if (zebra_register_lock (zh)) + return; + pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); for (i = 0; ierrCode = 0; - zh->errString = NULL; - zebra_register_lock (zh); + if (zebra_register_lock (zh)) + { + *entries = 0; + *num_entries = 0; + return; + } map_basenames (zh, stream, &num_bases, &basenames); rpn_scan (zh, stream, zapt, attributeset, num_bases, basenames, position, @@ -443,14 +523,37 @@ void zebra_sort (ZebraHandle zh, ODR stream, const char *output_setname, Z_SortKeySpecList *sort_sequence, int *sort_status) { - zh->errCode = 0; - zh->errString = NULL; - zebra_register_lock (zh); + if (zebra_register_lock (zh)) + return; resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, output_setname, sort_sequence, sort_status); zebra_register_unlock (zh); } +int zebra_deleleResultSet(ZebraHandle zh, int function, + int num_setnames, char **setnames, + int *statuses) +{ + int i, status; + if (zebra_register_lock (zh)) + return Z_DeleteStatus_systemProblemAtTarget; + switch (function) + { + case Z_DeleteRequest_list: + resultSetDestroy (zh, num_setnames, setnames, statuses); + break; + case Z_DeleteRequest_all: + resultSetDestroy (zh, -1, 0, statuses); + break; + } + zebra_register_unlock (zh); + status = Z_DeleteStatus_success; + for (i = 0; ierrCode;