X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=0d9d8156d621f6964ef18708270e48ae490bc715;hb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;hp=30e84a791428f1ae189531cdaed22aa7d6a3b134;hpb=0481a9d462ba15064121ecd84a5d59b70fb000a4;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 30e84a7..0d9d815 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,10 +1,54 @@ /* - * Copyright (C) 1995-1998, Index Data ApS + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraapi.c,v $ - * Revision 1.8 1998-08-24 17:29:23 adam + * 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 + * First version of ISAMS. + * + * Revision 1.16 1999/02/19 10:38:30 adam + * Implemented chdir-setting. + * + * Revision 1.15 1999/02/17 12:18:12 adam + * Fixed zebra_close so that a NULL pointer is ignored. + * + * Revision 1.14 1999/02/02 14:51:11 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.13 1998/12/16 12:23:30 adam + * Added facility for database name mapping using resource mapdb. + * + * Revision 1.12 1998/11/16 10:18:10 adam + * Better error reporting for result sets. + * + * Revision 1.11 1998/10/16 08:14:34 adam + * Updated record control system. + * + * Revision 1.10 1998/09/22 10:03:42 adam + * Changed result sets to be persistent in the sense that they can + * be re-searched if needed. + * Fixed memory leak in rsm_or. + * + * Revision 1.9 1998/09/02 13:53:17 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.8 1998/08/24 17:29:23 adam * Minor changes. * * Revision 1.7 1998/06/24 12:16:13 adam @@ -35,9 +79,10 @@ */ #include -#ifdef WINDOWS +#ifdef WIN32 #include #include +#include #else #include #endif @@ -45,10 +90,33 @@ #include #include "zserver.h" +static void zebra_chdir (ZebraHandle zh) +{ + const char *dir = res_get (zh->res, "chdir"); + if (!dir) + return; + logf (LOG_DEBUG, "chdir %s", dir); +#ifdef WIN32 + _chdir(dir); +#else + chdir (dir); +#endif +} + +static void zebra_register_unlock (ZebraHandle zh); + static int zebra_register_lock (ZebraHandle zh) { time_t lastChange; - int state = zebra_server_lock_get_state(zh, &lastChange); + int state; + + zh->errCode = 0; + zh->errString = 0; + zh->hits = 0; + + zebra_chdir (zh); + + state = zebra_server_lock_get_state(zh, &lastChange); switch (state) { @@ -59,7 +127,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) @@ -78,50 +146,87 @@ 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->isam) is_close (zh->isam); if (zh->isamc) isc_close (zh->isamc); + if (zh->isams) + isams_close (zh->isams); 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))) - { - logf (LOG_WARN, "dict_open"); - return -1; - } - if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0))) - { - logf (LOG_WARN, "sortIdx_open"); - return -1; - } + zh->isam = NULL; zh->isamc = NULL; - if (!res_get_match (zh->res, "isam", "i", NULL)) - { - if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC, - 0, key_isamc_m(zh->res)))) - { - logf (LOG_WARN, "isc_open"); - return -1; - } + zh->isams = NULL; + zh->dict = NULL; + zh->sortIdx = NULL; + zh->zei = NULL; + if (!(zh->records = rec_open (zh->bfs, 0, 0))) + { + logf (LOG_WARN, "rec_open"); + zh->errCode = 2; } else { - if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0, - sizeof (struct it_key), zh->res))) + if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0, 0))) + { + logf (LOG_WARN, "dict_open"); + zh->errCode = 2; + } + if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0))) + { + logf (LOG_WARN, "sortIdx_open"); + zh->errCode = 2; + } + if (res_get_match (zh->res, "isam", "i", NULL)) { - logf (LOG_WARN, "is_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", "s", NULL)) + { + 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; + } + } + else + { + 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; + } + } + 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; } @@ -129,7 +234,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), @@ -143,7 +248,7 @@ static void zebra_register_unlock (ZebraHandle zh) else waitSec = 0; } -#ifdef WINDOWS +#ifdef WIN32 #else if (waitSec > 0) sleep (waitSec); @@ -154,13 +259,15 @@ 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); return NULL; } + zebra_chdir (zh); zebra_server_lock_init (zh); zh->dh = data1_create (); zh->bfs = bfs_create (res_get (zh->res, "register")); @@ -169,7 +276,9 @@ ZebraHandle zebra_open (const char *configName) zh->sets = NULL; zh->registerState = -1; /* trigger open of registers! */ zh->registerChange = 0; - + zh->recTypes = recTypes_init (zh->dh); + recTypes_default_handlers (zh->recTypes); + zh->records = NULL; zh->zebra_maps = zebra_maps_open (zh->res); zh->rank_classes = NULL; @@ -193,6 +302,9 @@ ZebraHandle zebra_open (const char *configName) void zebra_close (ZebraHandle zh) { + if (!zh) + return; + zebra_chdir (zh); if (zh->records) { resultSetDestroy (zh); @@ -203,9 +315,12 @@ void zebra_close (ZebraHandle zh) is_close (zh->isam); if (zh->isamc) isc_close (zh->isamc); + if (zh->isams) + isams_close (zh->isams); rec_close (&zh->records); zebra_register_unlock (zh); } + recTypes_destroy (zh->recTypes); zebra_maps_close (zh->zebra_maps); zebraRankDestroy (zh); bfs_destroy (zh->bfs); @@ -216,17 +331,86 @@ void zebra_close (ZebraHandle zh) passwd_db_close (zh->passwd_db); res_close (zh->res); xfree (zh); + xmalloc_trav("x"); +} + +struct map_baseinfo { + ZebraHandle zh; + NMEM mem; + int num_bases; + char **basenames; + int new_num_bases; + char **new_basenames; + int new_num_max; +}; + +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]; + + no = + sscanf (value, "%127s %127s %127s %127s %127s %127s %127s %127s %127s", + fromdb, todb[0], todb[1], todb[2], todb[3], todb[4], + todb[5], todb[6], todb[7]); + if (no < 2) + return ; + no--; + for (i = 0; inum_bases; i++) + if (p->basenames[i] && !strcmp (p->basenames[i], fromdb)) + { + p->basenames[i] = 0; + for (i = 0; i < no; i++) + { + if (p->new_num_bases == p->new_num_max) + return; + p->new_basenames[(p->new_num_bases)++] = + nmem_strdup (p->mem, todb[i]); + } + return; + } } -void zebra_search_rpn (ZebraHandle zh, ODR stream, +void map_basenames (ZebraHandle zh, ODR stream, + int *num_bases, char ***basenames) +{ + struct map_baseinfo info; + struct map_baseinfo *p = &info; + int i; + + info.zh = zh; + info.num_bases = *num_bases; + info.basenames = *basenames; + info.new_num_max = 128; + info.new_num_bases = 0; + info.new_basenames = (char **) + odr_malloc (stream, sizeof(*info.new_basenames) * info.new_num_max); + info.mem = stream->mem; + + res_trav (zh->res, "mapdb", &info, map_basenames_func); + + for (i = 0; inum_bases; i++) + if (p->basenames[i] && p->new_num_bases < p->new_num_max) + { + p->new_basenames[(p->new_num_bases)++] = + nmem_strdup (p->mem, p->basenames[i]); + } + *num_bases = info.new_num_bases; + *basenames = info.new_basenames; + for (i = 0; i<*num_bases; i++) + logf (LOG_LOG, "base %s", (*basenames)[i]); +} + +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; - rpn_search (zh, stream, query, num_bases, basenames, setname); + if (zebra_register_lock (zh)) + return; + map_basenames (zh, stream, &num_bases, &basenames); + resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname); + zebra_register_unlock (zh); } @@ -238,19 +422,17 @@ 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 = 13; + zh->errCode = 30; + zh->errString = nmem_strdup (stream->mem, setname); } else { @@ -258,8 +440,12 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, { if (!poset[i].sysno) { + char num_str[20]; + + sprintf (num_str, "%d", pos_array[i]); zh->errCode = 13; - logf (LOG_DEBUG, "Out of range. pos=%d", pos_array[i]); + zh->errString = nmem_strdup (stream->mem, num_str); + break; } else { @@ -284,9 +470,13 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int *position, int *num_entries, ZebraScanEntry **entries, int *is_partial) { - zh->errCode = 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, num_entries, entries, is_partial); @@ -298,10 +488,9 @@ 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); - resultSetSort (zh, stream, num_input_setnames, input_setnames, + 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); }