X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=cf81adc35ab127afb378482d15ab0744e627ec15;hb=da822637709558b602b796afed937ef434209749;hp=7caf21a3166d9a045fa68ea9e5be42271c30f5c7;hpb=3f45c68ea8b1d3a3e9c5b3a014b3d001e89c46eb;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 7caf21a..cf81adc 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,10 +1,56 @@ /* - * Copyright (C) 1995-1998, Index Data I/S + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraapi.c,v $ - * Revision 1.5 1998-06-13 00:14:08 adam + * 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 + * Support for relations on text operands. Open range support in + * DFA module (i.e. [-j], [g-]). + * + * Revision 1.6 1998/06/22 11:36:47 adam + * Added authentication check facility to zebra. + * + * Revision 1.5 1998/06/13 00:14:08 adam * Minor changes. * * Revision 1.4 1998/06/12 12:22:12 adam @@ -25,9 +71,10 @@ */ #include -#ifdef WINDOWS +#ifdef WIN32 #include #include +#include #else #include #endif @@ -35,10 +82,26 @@ #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 int zebra_register_lock (ZebraHandle zh) { time_t lastChange; - int state = zebra_server_lock_get_state(zh, &lastChange); + int state; + + zebra_chdir (zh); + + state = zebra_server_lock_get_state(zh, &lastChange); switch (state) { @@ -79,24 +142,45 @@ static int zebra_register_lock (ZebraHandle zh) 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))) + 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->isam = NULL; zh->isamc = NULL; - if (!res_get_match (zh->res, "isam", "i", NULL)) + zh->isams = 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)))) + 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; - + } + } + else if (res_get_match (zh->res, "isam", "s", NULL)) + { + if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, 0, + key_isams_m(zh->res)))) + { + logf (LOG_WARN, "isams_open"); + return -1; + } } else { - if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0, - sizeof (struct it_key), zh->res))) + if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC, + 0, key_isamc_m(zh->res)))) + { + logf (LOG_WARN, "isc_open"); return -1; + } } zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0); @@ -121,7 +205,7 @@ static void zebra_register_unlock (ZebraHandle zh) else waitSec = 0; } -#ifdef WINDOWS +#ifdef WIN32 #else if (waitSec > 0) sleep (waitSec); @@ -132,13 +216,14 @@ static void zebra_register_unlock (ZebraHandle zh) ZebraHandle zebra_open (const char *configName) { - ZebraHandle zh = xmalloc (sizeof(*zh)); + ZebraHandle 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")); @@ -147,7 +232,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; @@ -155,11 +242,25 @@ ZebraHandle zebra_open (const char *configName) zh->errString = 0; zebraRankInstall (zh, rank1_class); + + if (!res_get (zh->res, "passwd")) + zh->passwd_db = NULL; + else + { + zh->passwd_db = passwd_db_open (); + if (!zh->passwd_db) + logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed"); + else + passwd_db_file (zh->passwd_db, res_get (zh->res, "passwd")); + } return zh; } void zebra_close (ZebraHandle zh) { + if (!zh) + return; + zebra_chdir (zh); if (zh->records) { resultSetDestroy (zh); @@ -170,20 +271,93 @@ 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); data1_destroy (zh->dh); zebra_server_lock_destroy (zh); + if (zh->passwd_db) + passwd_db_close (zh->passwd_db); res_close (zh->res); xfree (zh); } -void zebra_search_rpn (ZebraHandle zh, ODR stream, +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 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) { @@ -191,7 +365,10 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream, zh->errCode = 0; zh->errString = NULL; zh->hits = 0; - rpn_search (zh, stream, query, num_bases, basenames, setname); + + map_basenames (zh, stream, &num_bases, &basenames); + resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname); + zebra_register_unlock (zh); } @@ -205,7 +382,7 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, zh->errCode = 0; zh->errString = NULL; - pos_array = xmalloc (num_recs * sizeof(*pos_array)); + 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 { @@ -223,8 +401,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 { @@ -252,6 +434,7 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, zh->errCode = 0; zh->errString = NULL; zebra_register_lock (zh); + map_basenames (zh, stream, &num_bases, &basenames); rpn_scan (zh, stream, zapt, attributeset, num_bases, basenames, position, num_entries, entries, is_partial); @@ -259,14 +442,14 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, } void zebra_sort (ZebraHandle zh, ODR stream, - int num_input_setnames, char **input_setnames, - char *output_setname, Z_SortKeySpecList *sort_sequence, + int num_input_setnames, const char **input_setnames, + 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, + resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, output_setname, sort_sequence, sort_status); zebra_register_unlock (zh); } @@ -291,6 +474,13 @@ int zebra_hits (ZebraHandle zh) return zh->hits; } +int zebra_auth (ZebraHandle zh, const char *user, const char *pass) +{ + if (!zh->passwd_db || !passwd_db_auth (zh->passwd_db, user, pass)) + return 0; + return 1; +} + void zebra_setDB (ZebraHandle zh, int num_bases, char **basenames) {