X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=c2ae1d2498f2ad2c08cc0452e48c40bc6c65b784;hb=399876019df22a56614e9fda05552574939ccc0d;hp=1bb461b2cd010af735e13b7cc634f82cd45f4623;hpb=eb2b742588ce07fb4516bbca22c93b938b13e433;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 1bb461b..c2ae1d2 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,104 +1,11 @@ /* - * Copyright (C) 1995-1999, Index Data + * Copyright (C) 1995-2002, Index Data * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: zebraapi.c,v $ - * Revision 1.28 2000-03-15 15:00:30 adam - * First work on threaded version. - * - * Revision 1.27 2000/02/24 12:31:17 adam - * Added zebra_string_norm. - * - * 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 - * 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 - * Work on Zebra API. - * - * Revision 1.3 1998/05/27 16:57:44 adam - * Zebra returns surrogate diagnostic for single records when - * appropriate. - * - * Revision 1.2 1998/05/20 10:12:19 adam - * Implemented automatic EXPLAIN database maintenance. - * Modified Zebra to work with ASN.1 compiled version of YAZ. - * - * Revision 1.1 1998/03/05 08:45:13 adam - * New result set model and modular ranking system. Moved towards - * descent server API. System information stored as "SGML" records. * + * $Id: zebraapi.c,v 1.46 2002-02-20 23:07:54 adam Exp $ */ +#include #include #ifdef WIN32 #include @@ -110,6 +17,7 @@ #include #include "zserver.h" +#include static void zebra_chdir (ZebraService zh) { @@ -124,278 +32,347 @@ static void zebra_chdir (ZebraService zh) #endif } -static void zebra_register_unlock (ZebraService zh); +static void zebra_flush_reg (ZebraHandle zh) +{ + zebraExplain_flush (zh->service->zei, 1, zh); + + extract_flushWriteKeys (zh); + zebra_index_merge (zh); +} + + +static int zebra_register_activate (ZebraHandle zh, int rw, int useshadow); +static int zebra_register_deactivate (ZebraHandle zh); + +static int zebra_begin_read (ZebraHandle zh); +static void zebra_end_read (ZebraHandle zh); -static int zebra_register_lock (ZebraService zh) +ZebraHandle zebra_open (ZebraService zs) { - time_t lastChange; - int state; - int errCode = 0; + ZebraHandle zh; - errCode = 0; + assert (zs); + if (zs->stop_flag) + return 0; - zebra_chdir (zh); + zh = (ZebraHandle) xmalloc (sizeof(*zh)); + yaz_log (LOG_LOG, "zebra_open zs=%p returns %p", zs, zh); - state = zebra_server_lock_get_state(zh, &lastChange); + zh->service = zs; + zh->sets = 0; + zh->destroyed = 0; + zh->errCode = 0; + zh->errString = 0; - switch (state) - { - case 'c': - state = 1; - break; - default: - state = 0; - } - zebra_server_lock (zh, state); -#if HAVE_SYS_TIMES_H - times (&zh->tms1); -#endif - if (zh->registerState == state) + zh->trans_no = 0; + zh->seqno = 0; + zh->last_val = 0; + + zh->lock_normal = zebra_lock_create ("norm.LCK", 0); + zh->lock_shadow = zebra_lock_create ("shadow.LCK", 0); + + zh->key_buf = 0; + zh->admin_databaseName = 0; + + zh->keys.buf_max = 0; + zh->keys.buf = 0; + + zebra_mutex_cond_lock (&zs->session_lock); + + zh->next = zs->sessions; + zs->sessions = zh; + + zebra_mutex_cond_unlock (&zs->session_lock); + + return zh; +} + + +ZebraService zebra_start (const char *configName) +{ + ZebraService zh = xmalloc (sizeof(*zh)); + + yaz_log (LOG_LOG, "zebra_start %s", configName); + + zh->configName = xstrdup(configName); + zh->sessions = 0; + zh->stop_flag = 0; + zh->active = 1; + + zh->registerState = -1; + zh->registerChange = 0; + + if (!(zh->res = res_open (zh->configName))) { - if (zh->registerChange >= lastChange) - return 0; - logf (LOG_LOG, "Register completely updated since last access"); + logf (LOG_WARN, "Failed to read resources `%s'", zh->configName); +// return zh; } - else if (zh->registerState == -1) - logf (LOG_LOG, "Reading register using state %d pid=%ld", state, - (long) getpid()); + zebra_chdir (zh); + + zebra_mutex_cond_init (&zh->session_lock); + if (!res_get (zh->res, "passwd")) + zh->passwd_db = NULL; else - logf (LOG_LOG, "Register has changed state from %d to %d", - zh->registerState, state); - zh->registerChange = lastChange; - if (zh->records) - { - zebraExplain_close (zh->zei, 0, 0); - 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); + { + 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")); } - bf_cache (zh->bfs, state ? res_get (zh->res, "shadow") : NULL); - zh->registerState = state; - zh->isams = NULL; + return zh; +} + +static int zebra_register_activate (ZebraHandle zh, int rw, int useshadow) +{ + ZebraService zs = zh->service; + int record_compression = REC_COMPRESS_NONE; + char *recordCompression = 0; + + yaz_log (LOG_LOG, "zebra_open_register_activate rw = %d useshadow=%d", + rw, useshadow); + + zs->dh = data1_create (); + if (!zs->dh) + return -1; + zs->bfs = bfs_create (res_get (zs->res, "register")); + if (!zs->bfs) + { + data1_destroy(zs->dh); + return -1; + } + bf_lockDir (zs->bfs, res_get (zs->res, "lockDir")); + if (useshadow) + bf_cache (zs->bfs, res_get (zs->res, "shadow")); + data1_set_tabpath (zs->dh, res_get(zs->res, "profilePath")); + zs->recTypes = recTypes_init (zs->dh); + recTypes_default_handlers (zs->recTypes); + + zs->zebra_maps = zebra_maps_open (zs->res); + zs->rank_classes = NULL; + + zs->records = 0; + zs->dict = 0; + zs->sortIdx = 0; + zs->isams = 0; + zs->matchDict = 0; #if ZMBOL - zh->isam = NULL; - zh->isamc = NULL; + zs->isam = 0; + zs->isamc = 0; + zs->isamd = 0; #endif - zh->dict = NULL; - zh->sortIdx = NULL; - zh->zei = NULL; + zs->zei = 0; + zs->matchDict = 0; + + zebraRankInstall (zs, rank1_class); + + recordCompression = res_get_def (zh->service->res, + "recordCompression", "none"); + if (!strcmp (recordCompression, "none")) + record_compression = REC_COMPRESS_NONE; + if (!strcmp (recordCompression, "bzip2")) + record_compression = REC_COMPRESS_BZIP2; - if (!(zh->records = rec_open (zh->bfs, 0, 0))) + if (!(zs->records = rec_open (zs->bfs, rw, record_compression))) { logf (LOG_WARN, "rec_open"); - errCode = 2; + return -1; } - else + if (rw) { - if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0, 0))) - { - logf (LOG_WARN, "dict_open"); - errCode = 2; - } - if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0))) + zs->matchDict = dict_open (zs->bfs, GMATCH_DICT, 50, 1, 0); + } + if (!(zs->dict = dict_open (zs->bfs, FNAME_DICT, 80, rw, 0))) + { + logf (LOG_WARN, "dict_open"); + return -1; + } + if (!(zs->sortIdx = sortIdx_open (zs->bfs, rw))) + { + logf (LOG_WARN, "sortIdx_open"); + return -1; + } + if (res_get_match (zs->res, "isam", "s", ISAM_DEFAULT)) + { + struct ISAMS_M_s isams_m; + if (!(zs->isams = isams_open (zs->bfs, FNAME_ISAMS, rw, + key_isams_m(zs->res, &isams_m)))) { - logf (LOG_WARN, "sortIdx_open"); - 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"); - errCode = 2; - } + logf (LOG_WARN, "isams_open"); + return -1; } + } #if ZMBOL - else if (res_get_match (zh->res, "isam", "i", ISAM_DEFAULT)) + else if (res_get_match (zs->res, "isam", "i", ISAM_DEFAULT)) + { + if (!(zs->isam = is_open (zs->bfs, FNAME_ISAM, key_compare, rw, + sizeof (struct it_key), zs->res))) { - if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0, - sizeof (struct it_key), zh->res))) - { - logf (LOG_WARN, "is_open"); - errCode = 2; - } + logf (LOG_WARN, "is_open"); + return -1; } - else if (res_get_match (zh->res, "isam", "c", ISAM_DEFAULT)) + } + else if (res_get_match (zs->res, "isam", "c", ISAM_DEFAULT)) + { + struct ISAMC_M_s isamc_m; + if (!(zs->isamc = isc_open (zs->bfs, FNAME_ISAMC, + rw, key_isamc_m(zs->res, &isamc_m)))) { - 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"); - errCode = 2; - } + logf (LOG_WARN, "isc_open"); + return -1; } -#endif - zh->zei = zebraExplain_open (zh->records, zh->dh, - zh->res, 0, 0, 0); - if (!zh->zei) + } + else if (res_get_match (zs->res, "isam", "d", ISAM_DEFAULT)) + { + struct ISAMD_M_s isamd_m; + + if (!(zs->isamd = isamd_open (zs->bfs, FNAME_ISAMD, + rw, key_isamd_m(zs->res, &isamd_m)))) { - logf (LOG_WARN, "Cannot obtain EXPLAIN information"); - errCode = 2; + logf (LOG_WARN, "isamd_open"); + return -1; } } - if (errCode) +#endif + zs->zei = zebraExplain_open (zs->records, zs->dh, + zs->res, rw, zh, + explain_extract); + if (!zs->zei) { - zebra_register_unlock (zh); - zh->registerState = -1; + logf (LOG_WARN, "Cannot obtain EXPLAIN information"); return -1; } - return errCode; + zs->active = 2; + yaz_log (LOG_LOG, "zebra_register_activate ok"); + return 0; } -static void zebra_register_unlock (ZebraService zh) +void zebra_admin_shutdown (ZebraHandle zh) { - static int waitSec = -1; - -#if HAVE_SYS_TIMES_H - times (&zh->tms2); - logf (LOG_LOG, "user/system: %ld/%ld", - (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), - (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); -#endif - if (waitSec == -1) - { - char *s = res_get (zh->res, "debugRequestWait"); - if (s) - waitSec = atoi (s); - else - waitSec = 0; - } -#ifdef WIN32 -#else - if (waitSec > 0) - sleep (waitSec); -#endif - if (zh->registerState != -1) - zebra_server_unlock (zh, zh->registerState); + zebra_mutex_cond_lock (&zh->service->session_lock); + zh->service->stop_flag = 1; + if (!zh->service->sessions) + zebra_register_deactivate(zh); + zh->service->active = 0; + zebra_mutex_cond_unlock (&zh->service->session_lock); } -ZebraHandle zebra_open (ZebraService service) +void zebra_admin_start (ZebraHandle zh) { - ZebraHandle zh; - - zh = (ZebraHandle) xmalloc (sizeof(*zh)); - - zh->service = service; - zh->sets = 0; - - return zh; + ZebraService zs = zh->service; + zh->errCode = 0; + zebra_mutex_cond_lock (&zs->session_lock); + if (!zs->stop_flag) + zh->service->active = 1; + zebra_mutex_cond_unlock (&zs->session_lock); } -ZebraService zebra_start (const char *configName) +static int zebra_register_deactivate (ZebraHandle zh) { - ZebraService zh = xmalloc (sizeof(*zh)); - zh->configName = xstrdup(configName); - zh->sessions = 0; - yaz_log (LOG_LOG, "zebra_start %s", configName); - 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 (); - if (!zh->dh) + ZebraService zs = zh->service; + zs->stop_flag = 0; + if (zs->active <= 1) { - 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; + yaz_log(LOG_LOG, "zebra_register_deactivate (ignored since active=%d)", + zs->active); + return 0; } - bf_lockDir (zh->bfs, res_get (zh->res, "lockDir")); - data1_set_tabpath (zh->dh, res_get(zh->res, "profilePath")); - 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; - - zebraRankInstall (zh, rank1_class); - - if (!res_get (zh->res, "passwd")) - zh->passwd_db = NULL; - else + yaz_log(LOG_LOG, "zebra_register_deactivate"); + zebra_chdir (zs); + if (zs->records) { - 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")); + zebraExplain_close (zs->zei, 0); + dict_close (zs->dict); + if (zs->matchDict) + dict_close (zs->matchDict); + sortIdx_close (zs->sortIdx); + if (zs->isams) + isams_close (zs->isams); +#if ZMBOL + if (zs->isam) + is_close (zs->isam); + if (zs->isamc) + isc_close (zs->isamc); + if (zs->isamd) + isamd_close (zs->isamd); +#endif + rec_close (&zs->records); } - return zh; + resultSetInvalidate (zh); + + recTypes_destroy (zs->recTypes); + zebra_maps_close (zs->zebra_maps); + zebraRankDestroy (zs); + bfs_destroy (zs->bfs); + data1_destroy (zs->dh); + + if (zs->passwd_db) + passwd_db_close (zs->passwd_db); + zs->active = 1; + return 0; } -void zebra_stop(ZebraService zh) +void zebra_stop(ZebraService zs) { - if (!zh) + if (!zs) return ; yaz_log (LOG_LOG, "zebra_stop"); - /* wait for sessions to die ...... */ - - zebra_chdir (zh); - if (zh->records) + zebra_mutex_cond_lock (&zs->session_lock); + while (zs->sessions) { - 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); -#endif - rec_close (&zh->records); - zebra_register_unlock (zh); + zebra_register_deactivate(zs->sessions); + zebra_close (zs->sessions); } - 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); + + zebra_mutex_cond_unlock (&zs->session_lock); - if (zh->passwd_db) - passwd_db_close (zh->passwd_db); - res_close (zh->res); + zebra_mutex_cond_destroy (&zs->session_lock); - xfree (zh->configName); - xfree (zh); + res_close (zs->res); + xfree (zs->configName); + xfree (zs); } void zebra_close (ZebraHandle zh) { + ZebraService zs; + struct zebra_session **sp; + + if (!zh) + return; + + zs = zh->service; + yaz_log (LOG_LOG, "zebra_close zh=%p", zh); if (!zh) return ; resultSetDestroy (zh, -1, 0, 0); + if (zh->key_buf) + { + xfree (zh->key_buf); + zh->key_buf = 0; + } + + xfree (zh->admin_databaseName); + zebra_mutex_cond_lock (&zs->session_lock); + zebra_lock_destroy (zh->lock_normal); + zebra_lock_destroy (zh->lock_shadow); + sp = &zs->sessions; + while (1) + { + assert (*sp); + if (*sp == zh) + { + *sp = (*sp)->next; + break; + } + sp = &(*sp)->next; + } +// if (!zs->sessions && zs->stop_flag) +// zebra_register_deactivate(zs); + zebra_mutex_cond_unlock (&zs->session_lock); xfree (zh); } @@ -472,12 +449,14 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode, const char *setname) { zh->hits = 0; - if (zebra_register_lock (zh->service)) + if (zebra_begin_read (zh)) return; map_basenames (zh, stream, &num_bases, &basenames); resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname); - zebra_register_unlock (zh->service); + zebra_end_read (zh); + + logf(LOG_APP,"SEARCH:%d:",zh->hits); } void zebra_records_retrieve (ZebraHandle zh, ODR stream, @@ -488,8 +467,9 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, ZebraPosSet poset; int i, *pos_array; - if (zebra_register_lock (zh->service)) + if (zebra_begin_read (zh)) return; + pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); for (i = 0; ierrCode = 13; - zh->errString = nmem_strdup (stream->mem, num_str); - break; + recs[i].errCode = 0; + recs[i].format = VAL_SUTRS; + recs[i].len = strlen(poset[i].term); + recs[i].buf = poset[i].term; + recs[i].base = poset[i].db; } - else + else if (poset[i].sysno) { recs[i].errCode = zebra_record_fetch (zh, poset[i].sysno, poset[i].score, @@ -523,10 +502,19 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, &recs[i].base); recs[i].errString = NULL; } + else + { + char num_str[20]; + + sprintf (num_str, "%d", pos_array[i]); + zh->errCode = 13; + zh->errString = nmem_strdup (stream->mem, num_str); + break; + } } zebraPosSetDestroy (zh, poset, num_recs); } - zebra_register_unlock (zh->service); + zebra_end_read (zh); xfree (pos_array); } @@ -536,7 +524,7 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int *position, int *num_entries, ZebraScanEntry **entries, int *is_partial) { - if (zebra_register_lock (zh->service)) + if (zebra_begin_read (zh)) { *entries = 0; *num_entries = 0; @@ -546,7 +534,7 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, rpn_scan (zh, stream, zapt, attributeset, num_bases, basenames, position, num_entries, entries, is_partial); - zebra_register_unlock (zh->service); + zebra_end_read (zh); } void zebra_sort (ZebraHandle zh, ODR stream, @@ -554,11 +542,11 @@ void zebra_sort (ZebraHandle zh, ODR stream, const char *output_setname, Z_SortKeySpecList *sort_sequence, int *sort_status) { - if (zebra_register_lock (zh->service)) + if (zebra_begin_read (zh)) return; resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, output_setname, sort_sequence, sort_status); - zebra_register_unlock (zh->service); + zebra_end_read(zh); } int zebra_deleleResultSet(ZebraHandle zh, int function, @@ -566,7 +554,7 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, int *statuses) { int i, status; - if (zebra_register_lock (zh->service)) + if (zebra_begin_read(zh)) return Z_DeleteStatus_systemProblemAtTarget; switch (function) { @@ -577,7 +565,7 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, resultSetDestroy (zh, -1, 0, statuses); break; } - zebra_register_unlock (zh->service); + zebra_end_read (zh); status = Z_DeleteStatus_success; for (i = 0; ipasswd_db || !passwd_db_auth (zh->passwd_db, user, pass)) + { + logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS"); return 0; + } + + logf(LOG_APP,"AUTHFAIL:%s", user?user:"ANONYMOUS"); return 1; } -void zebra_setDB (ZebraHandle zh, int num_bases, char **basenames) +void zebra_admin_import_begin (ZebraHandle zh, const char *database) { - + zebra_begin_trans (zh); + xfree (zh->admin_databaseName); + zh->admin_databaseName = xstrdup(database); } -void zebra_setRecordType (ZebraHandle zh, const char *type) +void zebra_admin_import_end (ZebraHandle zh) { - + zebra_end_trans (zh); } -void zebra_setGroup (ZebraHandle zh, const char *group) +void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { + int sysno; + int i; + if (zh->service->active < 2) + return; + for (i = 0; inum_segmentRecords; i++) + { + Z_NamePlusRecord *npr = segment->segmentRecords[i]; + const char *databaseName = npr->databaseName; + if (!databaseName) + databaseName = zh->admin_databaseName; + printf ("--------------%d--------------------\n", i); + if (npr->which == Z_NamePlusRecord_intermediateFragment) + { + Z_FragmentSyntax *fragment = npr->u.intermediateFragment; + if (fragment->which == Z_FragmentSyntax_notExternallyTagged) + { + Odr_oct *oct = fragment->u.notExternallyTagged; + printf ("%.*s", (oct->len > 100 ? 100 : oct->len) , + oct->buf); + + sysno = 0; + extract_rec_in_mem (zh, "grs.sgml", + oct->buf, oct->len, + databaseName, + 0 /* delete_flag */, + 0 /* test_mode */, + &sysno /* sysno */, + 1 /* store_keys */, + 1 /* store_data */, + 0 /* match criteria */); + } + } + } } void zebra_admin_create (ZebraHandle zh, const char *database) { - + ZebraService zs; + + zebra_begin_trans (zh); + + zs = zh->service; + /* announce database */ + if (zebraExplain_newDatabase (zh->service->zei, database, 0 + /* explainDatabase */)) + { + zh->errCode = 224; + zh->errString = "Database already exist"; + } + zebra_end_trans (zh); } int zebra_string_norm (ZebraHandle zh, unsigned reg_id, @@ -650,3 +690,297 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, output_str[wrbuf_len(wrbuf)] = '\0'; return wrbuf_len(wrbuf); } + + +void zebra_set_state (int val, int seqno) +{ + long p = getpid(); + FILE *f = fopen ("state.LCK", "w"); + fprintf (f, "%c %d %ld\n", val, seqno, p); + fclose (f); +} + +void zebra_get_state (char *val, int *seqno) +{ + FILE *f = fopen ("state.LCK", "r"); + + *val = 'o'; + *seqno = 0; + + if (f) + { + fscanf (f, "%c %d", val, seqno); + fclose (f); + } +} + +static int zebra_begin_read (ZebraHandle zh) +{ + int dirty = 0; + char val; + int seqno; + + + (zh->trans_no)++; + + if (zh->trans_no != 1) + { + zebra_flush_reg (zh); + return 0; + } + + zebra_get_state (&val, &seqno); + if (val == 'd') + val = 'o'; + if (seqno != zh->seqno) + { + yaz_log (LOG_LOG, "reopen seqno cur/old %d/%d", seqno, zh->seqno); + dirty = 1; + } + else if (zh->last_val != val) + { + yaz_log (LOG_LOG, "reopen last cur/old %d/%d", val, zh->last_val); + dirty = 1; + } + if (!dirty) + return 0; + + if (val == 'c') + zebra_lock_r (zh->lock_shadow); + else + zebra_lock_r (zh->lock_normal); + + zh->last_val = val; + zh->seqno = seqno; + + zebra_register_deactivate (zh); + + zebra_register_activate (zh, 0, val == 'c' ? 1 : 0); + return 0; +} + +static void zebra_end_read (ZebraHandle zh) +{ + (zh->trans_no)--; + + if (zh->trans_no != 0) + return; + + zebra_unlock (zh->lock_normal); + zebra_unlock (zh->lock_shadow); +} + +void zebra_begin_trans (ZebraHandle zh) +{ + int pass; + int seqno = 0; + char val = '?'; + const char *rval; + + (zh->trans_no++); + if (zh->trans_no != 1) + { + return; + } + + yaz_log (LOG_LOG, "zebra_begin_trans"); +#if HAVE_SYS_TIMES_H + times (&zh->tms1); +#endif + + /* lock */ + rval = res_get (zh->service->res, "shadow"); + + for (pass = 0; pass < 2; pass++) + { + if (rval) + { + zebra_lock_r (zh->lock_normal); + zebra_lock_w (zh->lock_shadow); + } + else + { + zebra_lock_w (zh->lock_normal); + zebra_lock_w (zh->lock_shadow); + } + + zebra_get_state (&val, &seqno); + if (val == 'c') + { + yaz_log (LOG_LOG, "previous transaction didn't finish commit"); + zebra_unlock (zh->lock_shadow); + zebra_unlock (zh->lock_normal); + zebra_commit (zh); + continue; + } + else if (val == 'd') + { + if (rval) + { + BFiles bfs = bfs_create (res_get (zh->service->res, "shadow")); + yaz_log (LOG_LOG, "previous transaction didn't reach commit"); + bf_commitClean (bfs, rval); + bfs_destroy (bfs); + } + else + { + yaz_log (LOG_WARN, "your previous transaction didn't finish"); + } + } + break; + } + if (pass == 2) + { + yaz_log (LOG_FATAL, "zebra_begin_trans couldn't finish commit"); + abort(); + return; + } + zebra_set_state ('d', seqno); + + zebra_register_activate (zh, 1, rval ? 1 : 0); + zh->seqno = seqno; +} + +void zebra_end_trans (ZebraHandle zh) +{ + char val; + int seqno; + const char *rval; + + zh->trans_no--; + if (zh->trans_no != 0) + return; + + yaz_log (LOG_LOG, "zebra_end_trans"); + rval = res_get (zh->service->res, "shadow"); + + zebra_flush_reg (zh); + + zebra_register_deactivate (zh); + + zebra_get_state (&val, &seqno); + if (val != 'd') + { + BFiles bfs = bfs_create (res_get (zh->service->res, "shadow")); + bf_commitClean (bfs, rval); + bfs_destroy (bfs); + } + if (!rval) + seqno++; + zebra_set_state ('o', seqno); + + zebra_unlock (zh->lock_shadow); + zebra_unlock (zh->lock_normal); + +#if HAVE_SYS_TIMES_H + times (&zh->tms2); + logf (LOG_LOG, "user/system: %ld/%ld", + (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), + (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); + +#endif +} + +void zebra_repository_update (ZebraHandle zh) +{ + zebra_begin_trans (zh); + logf (LOG_LOG, "updating %s", zh->rGroup.path); + repositoryUpdate (zh); + zebra_end_trans (zh); +} + +void zebra_repository_delete (ZebraHandle zh) +{ + logf (LOG_LOG, "deleting %s", zh->rGroup.path); + repositoryDelete (zh); +} + +void zebra_repository_show (ZebraHandle zh) +{ + repositoryShow (zh); +} + +void zebra_commit (ZebraHandle zh) +{ + int seqno; + char val; + const char *rval = res_get (zh->service->res, "shadow"); + BFiles bfs; + + if (!rval) + { + logf (LOG_WARN, "Cannot perform commit"); + logf (LOG_WARN, "No shadow area defined"); + return; + } + + zebra_lock_w (zh->lock_normal); + zebra_lock_r (zh->lock_shadow); + + bfs = bfs_create (res_get (zh->service->res, "register")); + + zebra_get_state (&val, &seqno); + + if (rval && *rval) + bf_cache (bfs, rval); + if (bf_commitExists (bfs)) + { + zebra_set_state ('c', seqno); + + logf (LOG_LOG, "commit start"); + bf_commitExec (bfs); +#ifndef WIN32 + sync (); +#endif + logf (LOG_LOG, "commit clean"); + bf_commitClean (bfs, rval); + seqno++; + zebra_set_state ('o', seqno); + } + else + { + logf (LOG_LOG, "nothing to commit"); + } + bfs_destroy (bfs); + + zebra_unlock (zh->lock_shadow); + zebra_unlock (zh->lock_normal); +} + +void zebra_init (ZebraHandle zh) +{ + const char *rval = res_get (zh->service->res, "shadow"); + BFiles bfs = 0; + + bfs = bfs_create (res_get (zh->service->res, "register")); + if (rval && *rval) + bf_cache (bfs, rval); + + bf_reset (bfs); + bfs_destroy (bfs); + zebra_set_state ('o', 0); +} + +void zebra_compact (ZebraHandle zh) +{ + BFiles bfs = bfs_create (res_get (zh->service->res, "register")); + inv_compact (bfs); + bfs_destroy (bfs); +} + +int zebra_record_insert (ZebraHandle zh, const char *buf, int len) +{ + int sysno = 0; + zebra_begin_trans (zh); + extract_rec_in_mem (zh, "grs.sgml", + buf, len, + "Default", /* database */ + 0 /* delete_flag */, + 0 /* test_mode */, + &sysno /* sysno */, + 1 /* store_keys */, + 1 /* store_data */, + 0 /* match criteria */); + zebra_end_trans (zh); + return sysno; +}