X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=3d9d89f246a9de2427fd4fd41cc5af20b12d4776;hp=bb0c06fbe0f1d7a9ed0e838ec1ddb34bcfa29017;hb=13bf0c380e98816595127291b64368dd9b8ca639;hpb=7e75317bed8eecabcb57e59b16093a32238738e2 diff --git a/index/zebraapi.c b/index/zebraapi.c index bb0c06f..3d9d89f 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,12 +1,28 @@ -/* - * Copyright (C) 1995-2002, Index Data - * All rights reserved. - * - * $Id: zebraapi.c,v 1.45 2002-02-20 17:30:01 adam Exp $ - */ +/* $Id: zebraapi.c,v 1.128 2004-09-03 14:59:49 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ #include #include +#include #ifdef WIN32 #include #include @@ -16,12 +32,35 @@ #endif #include -#include "zserver.h" +#include +#include +#include "index.h" #include +#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 void zebra_chdir (ZebraService zh) +static Res zebra_open_res (ZebraHandle zh); +static void zebra_close_res (ZebraHandle zh); + + +static void zebra_chdir (ZebraService zs) { - const char *dir = res_get (zh->res, "chdir"); + const char *dir ; + ASSERTZS; + yaz_log(LOG_API,"zebra_chdir"); + dir = res_get (zs->global_res, "chdir"); if (!dir) return; logf (LOG_DEBUG, "chdir %s", dir); @@ -34,51 +73,70 @@ static void zebra_chdir (ZebraService zh) static void zebra_flush_reg (ZebraHandle zh) { - if (zh->service->matchDict) - dict_close (zh->service->matchDict); - zh->service->matchDict = 0; - zebraExplain_flush (zh->service->zei, 1, zh); + ASSERTZH; + yaz_log(LOG_API,"zebra_flush_reg"); + zh->errCode=0; + zebraExplain_flush (zh->reg->zei, zh); - extract_flushWriteKeys (zh); - zebra_index_merge (zh); + extract_flushWriteKeys (zh,1 /* final */); + 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 struct zebra_register *zebra_register_open (ZebraService zs, + const char *name, + int rw, int useshadow, + Res res, + const char *reg_path); +static void zebra_register_close (ZebraService zs, struct zebra_register *reg); ZebraHandle zebra_open (ZebraService zs) { ZebraHandle zh; + const char *default_encoding; + ASSERTZS; + yaz_log(LOG_API,"zebra_open"); - assert (zs); - if (zs->stop_flag) - return 0; + if (!zs) + return 0; zh = (ZebraHandle) xmalloc (sizeof(*zh)); - yaz_log (LOG_LOG, "zebra_open zs=%p returns %p", zs, zh); + yaz_log (LOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); zh->service = zs; + zh->reg = 0; /* no register attached yet */ zh->sets = 0; zh->destroyed = 0; zh->errCode = 0; zh->errString = 0; + zh->res = 0; + zh->user_perm = 0; + + zh->reg_name = xstrdup (""); + zh->path_reg = 0; + zh->num_basenames = 0; + zh->basenames = 0; zh->trans_no = 0; - zh->seqno = 0; - zh->last_val = 0; + zh->trans_w_no = 0; - zh->lock_normal = zebra_lock_create ("norm.LCK", 0); - zh->lock_shadow = zebra_lock_create ("shadow.LCK", 0); + zh->lock_normal = 0; + zh->lock_shadow = 0; - zh->key_buf = 0; - zh->admin_databaseName = 0; + zh->shadow_enable = 1; - zh->keys.buf_max = 0; - zh->keys.buf = 0; + 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", + 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", + default_encoding); zebra_mutex_cond_lock (&zs->session_lock); @@ -90,268 +148,339 @@ ZebraHandle zebra_open (ZebraService zs) return zh; } - ZebraService zebra_start (const char *configName) { - ZebraService zh = xmalloc (sizeof(*zh)); - - yaz_log (LOG_LOG, "zebra_start %s", configName); + return zebra_start_res(configName, 0, 0); +} - zh->configName = xstrdup(configName); - zh->sessions = 0; - zh->stop_flag = 0; - zh->active = 1; +ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res) +{ + Res res; - zh->registerState = -1; - zh->registerChange = 0; + yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName); - if (!(zh->res = res_open (zh->configName))) + if ((res = res_open (configName, def_res, over_res))) { - logf (LOG_WARN, "Failed to read resources `%s'", zh->configName); -// return zh; - } - zebra_chdir (zh); + ZebraService zh = xmalloc (sizeof(*zh)); - zebra_mutex_cond_init (&zh->session_lock); - 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")); + yaz_log (LOG_DEBUG, "Read resources `%s'", configName); + + zh->global_res = res; + zh->configName = xstrdup(configName); + zh->sessions = 0; + + zebra_chdir (zh); + + zebra_mutex_cond_init (&zh->session_lock); + if (!res_get (zh->global_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->global_res, "passwd")); + } + zh->path_root = res_get (zh->global_res, "root"); + return zh; } + return 0; +} - return zh; + +void zebra_pidfname(ZebraService zs, char *path) +{ + zebra_lock_prefix (zs->global_res, path); + strcat(path, "zebrasrv.pid"); } -static int zebra_register_activate (ZebraHandle zh, int rw, int useshadow) +static +struct zebra_register *zebra_register_open (ZebraService zs, const char *name, + int rw, int useshadow, Res res, + const char *reg_path) { - ZebraService zs = zh->service; + struct zebra_register *reg; int record_compression = REC_COMPRESS_NONE; - char *recordCompression = 0; + const char *recordCompression = 0; + const char *profilePath; + char cwd[1024]; - yaz_log (LOG_LOG, "zebra_open_register_activate rw = %d useshadow=%d", - rw, useshadow); + ASSERTZS; + + reg = xmalloc (sizeof(*reg)); - zs->dh = data1_create (); - if (!zs->dh) - return -1; - zs->bfs = bfs_create (res_get (zs->res, "register")); - if (!zs->bfs) + assert (name); + reg->name = xstrdup (name); + + reg->seqno = 0; + reg->last_val = 0; + + assert (res); + + yaz_log (LOG_LOG|LOG_API, "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); + if (!reg->dh) + return 0; + reg->bfs = bfs_create (res_get (res, "register"), reg_path); + if (!reg->bfs) { - data1_destroy(zs->dh); - return -1; + data1_destroy(reg->dh); + return 0; } - 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->records = NULL; - zs->zebra_maps = zebra_maps_open (zs->res); - zs->rank_classes = NULL; - - zs->records = 0; - zs->dict = 0; - zs->sortIdx = 0; - zs->isams = 0; -#if ZMBOL - zs->isam = 0; - zs->isamc = 0; - zs->isamd = 0; + bf_cache (reg->bfs, res_get (res, "shadow")); + + getcwd(cwd, sizeof(cwd)-1); + profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); + yaz_log(LOG_LOG, "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->zebra_maps = zebra_maps_open (res, reg_path); + reg->rank_classes = NULL; + + reg->key_buf = 0; + + reg->keys.buf_max = 0; + reg->keys.buf = 0; +#if IT_KEY_NEW + reg->keys.codec_handle = iscz1_start(); #endif - zs->zei = 0; + + reg->sortKeys.buf = 0; + reg->sortKeys.buf_max = 0; + + reg->records = 0; + reg->dict = 0; + reg->sortIdx = 0; + reg->isams = 0; + reg->matchDict = 0; + reg->isamc = 0; + reg->isamb = 0; + reg->zei = 0; + reg->matchDict = 0; + reg->key_file_no = 0; + reg->ptr_i=0; - zebraRankInstall (zs, rank1_class); + zebraRankInstall (reg, rank1_class); + zebraRankInstall (reg, rankzv_class); + zebraRankInstall (reg, rankliv_class); - recordCompression = res_get_def (zh->service->res, - "recordCompression", "none"); + recordCompression = res_get_def (res, "recordCompression", "none"); if (!strcmp (recordCompression, "none")) record_compression = REC_COMPRESS_NONE; if (!strcmp (recordCompression, "bzip2")) record_compression = REC_COMPRESS_BZIP2; - if (!(zs->records = rec_open (zs->bfs, rw, record_compression))) + if (!(reg->records = rec_open (reg->bfs, rw, record_compression))) { logf (LOG_WARN, "rec_open"); - return -1; + return 0; + } + if (rw) + { + reg->matchDict = dict_open (reg->bfs, GMATCH_DICT, 20, 1, 0); } - if (!(zs->dict = dict_open (zs->bfs, FNAME_DICT, 80, rw, 0))) + if (!(reg->dict = dict_open (reg->bfs, FNAME_DICT, 40, rw, 0))) { logf (LOG_WARN, "dict_open"); - return -1; + return 0; } - if (!(zs->sortIdx = sortIdx_open (zs->bfs, rw))) + if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw))) { logf (LOG_WARN, "sortIdx_open"); - return -1; + return 0; } - if (res_get_match (zs->res, "isam", "s", ISAM_DEFAULT)) + if (res_get_match (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)))) + if (!(reg->isams = isams_open (reg->bfs, FNAME_ISAMS, rw, + key_isams_m(res, &isams_m)))) { logf (LOG_WARN, "isams_open"); - return -1; + return 0; } } -#if ZMBOL - else if (res_get_match (zs->res, "isam", "i", ISAM_DEFAULT)) + if (res_get_match (res, "isam", "c", ISAM_DEFAULT)) { - if (!(zs->isam = is_open (zs->bfs, FNAME_ISAM, key_compare, rw, - sizeof (struct it_key), zs->res))) + struct ISAMC_M_s isamc_m; + if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC, + rw, key_isamc_m(res, &isamc_m)))) { - logf (LOG_WARN, "is_open"); - return -1; + logf (LOG_WARN, "isc_open"); + return 0; + } + } + if (res_get_match (res, "isam", "b", ISAM_DEFAULT)) + { + struct ISAMC_M_s isamc_m; + + if (!(reg->isamb = isamb_open (reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), 0))) + { + logf (LOG_WARN, "isamb_open"); + return 0; } } - else if (res_get_match (zs->res, "isam", "c", ISAM_DEFAULT)) + if (res_get_match (res, "isam", "bc", 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)))) + + if (!(reg->isamb = isamb_open (reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), 1))) { - logf (LOG_WARN, "isc_open"); - return -1; + logf (LOG_WARN, "isamb_open"); + return 0; } } - else if (res_get_match (zs->res, "isam", "d", ISAM_DEFAULT)) + if (res_get_match (res, "isam", "null", ISAM_DEFAULT)) { - struct ISAMD_M_s isamd_m; + struct ISAMC_M_s isamc_m; - if (!(zs->isamd = isamd_open (zs->bfs, FNAME_ISAMD, - rw, key_isamd_m(zs->res, &isamd_m)))) + if (!(reg->isamb = isamb_open (reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), -1))) { - logf (LOG_WARN, "isamd_open"); - return -1; + logf (LOG_WARN, "isamb_open"); + return 0; } } -#endif - zs->zei = zebraExplain_open (zs->records, zs->dh, - zs->res, rw, zh, - explain_extract); - if (!zs->zei) + reg->zei = zebraExplain_open (reg->records, reg->dh, + res, rw, reg, + explain_extract); + if (!reg->zei) { logf (LOG_WARN, "Cannot obtain EXPLAIN information"); - return -1; + return 0; } - zs->active = 2; - yaz_log (LOG_LOG, "zebra_register_activate ok"); - return 0; + reg->active = 2; + yaz_log (LOG_DEBUG, "zebra_register_open ok p=%p", reg); + return reg; } -void zebra_admin_shutdown (ZebraHandle zh) +int zebra_admin_shutdown (ZebraHandle zh) { + ASSERTZH; + yaz_log(LOG_API,"zebra_admin_shutdown"); + zh->errCode=0; + 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); + return 0; } -void zebra_admin_start (ZebraHandle zh) +int zebra_admin_start (ZebraHandle zh) { - ZebraService zs = zh->service; - zh->errCode = 0; + ZebraService zs; + ASSERTZH; + yaz_log(LOG_API,"zebra_admin_start"); + zh->errCode=0; + zs = zh->service; zebra_mutex_cond_lock (&zs->session_lock); - if (!zs->stop_flag) - zh->service->active = 1; zebra_mutex_cond_unlock (&zs->session_lock); + return 0; } -static int zebra_register_deactivate (ZebraHandle zh) +static void zebra_register_close (ZebraService zs, struct zebra_register *reg) { - ZebraService zs = zh->service; - zs->stop_flag = 0; - if (zs->active <= 1) - { - yaz_log(LOG_LOG, "zebra_register_deactivate (ignored since active=%d)", - zs->active); - return 0; - } - yaz_log(LOG_LOG, "zebra_register_deactivate"); + ASSERTZS; + yaz_log(LOG_LOG|LOG_API, "zebra_register_close p=%p", reg); + reg->stop_flag = 0; zebra_chdir (zs); - if (zs->records) - { - zebraExplain_close (zs->zei, 0); - dict_close (zs->dict); - 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); + if (reg->records) + { + zebraExplain_close (reg->zei); + dict_close (reg->dict); + if (reg->matchDict) + dict_close (reg->matchDict); + sortIdx_close (reg->sortIdx); + if (reg->isams) + isams_close (reg->isams); + if (reg->isamc) + isc_close (reg->isamc); + if (reg->isamb) + isamb_close (reg->isamb); + rec_close (®->records); } - resultSetInvalidate (zh); - recTypes_destroy (zs->recTypes); - zebra_maps_close (zs->zebra_maps); - zebraRankDestroy (zs); - bfs_destroy (zs->bfs); - data1_destroy (zs->dh); + recTypes_destroy (reg->recTypes); + zebra_maps_close (reg->zebra_maps); + zebraRankDestroy (reg); + bfs_destroy (reg->bfs); + data1_destroy (reg->dh); + + xfree (reg->sortKeys.buf); + xfree (reg->keys.buf); +#if IT_KEY_NEW + if (reg->keys.codec_handle) + iscz1_stop(reg->keys.codec_handle); +#endif - if (zs->passwd_db) - passwd_db_close (zs->passwd_db); - zs->active = 1; - return 0; + xfree (reg->key_buf); + xfree (reg->name); + xfree (reg); } -void zebra_stop(ZebraService zs) +int zebra_stop(ZebraService zs) { if (!zs) - return ; - yaz_log (LOG_LOG, "zebra_stop"); + return 0; + yaz_log (LOG_LOG|LOG_API, "zebra_stop"); - zebra_mutex_cond_lock (&zs->session_lock); while (zs->sessions) { - zebra_register_deactivate(zs->sessions); zebra_close (zs->sessions); } - zebra_mutex_cond_unlock (&zs->session_lock); - zebra_mutex_cond_destroy (&zs->session_lock); - res_close (zs->res); + if (zs->passwd_db) + passwd_db_close (zs->passwd_db); + + res_close (zs->global_res); xfree (zs->configName); xfree (zs); + return 0; } -void zebra_close (ZebraHandle zh) +int zebra_close (ZebraHandle zh) { ZebraService zs; struct zebra_session **sp; + int i; + yaz_log(LOG_API,"zebra_close"); if (!zh) - return; - + return 0; + ASSERTZH; + zh->errCode=0; + zs = zh->service; - yaz_log (LOG_LOG, "zebra_close zh=%p", zh); - if (!zh) - return ; + yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh); resultSetDestroy (zh, -1, 0, 0); - if (zh->key_buf) - { - xfree (zh->key_buf); - zh->key_buf = 0; - } - - xfree (zh->admin_databaseName); + if (zh->reg) + zebra_register_close (zh->service, zh->reg); + zebra_close_res (zh); + + xfree (zh->record_encoding); + + for (i = 0; i < zh->num_basenames; i++) + xfree (zh->basenames[i]); + xfree (zh->basenames); + + 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); + zebra_mutex_cond_lock (&zs->session_lock); zebra_lock_destroy (zh->lock_normal); zebra_lock_destroy (zh->lock_shadow); @@ -366,10 +495,13 @@ void zebra_close (ZebraHandle zh) } sp = &(*sp)->next; } -// if (!zs->sessions && zs->stop_flag) -// zebra_register_deactivate(zs); zebra_mutex_cond_unlock (&zs->session_lock); + xfree (zh->reg_name); + xfree (zh->user_perm); + zh->service=0; /* more likely to trigger an assert */ + xfree (zh->path_reg); xfree (zh); + return 0; } struct map_baseinfo { @@ -381,7 +513,108 @@ struct map_baseinfo { char **new_basenames; int new_num_max; }; - + +static Res zebra_open_res (ZebraHandle zh) +{ + Res res = 0; + char fname[512]; + ASSERTZH; + zh->errCode=0; + + if (zh->path_reg) + { + sprintf (fname, "%.200s/zebra.cfg", zh->path_reg); + res = res_open (fname, zh->service->global_res, 0); + if (!res) + res = zh->service->global_res; + } + else if (*zh->reg_name == 0) + { + res = zh->service->global_res; + } + else + { + yaz_log (LOG_WARN, "no register root specified"); + return 0; /* no path for register - fail! */ + } + return res; +} + +static void zebra_close_res (ZebraHandle zh) +{ + ASSERTZH; + zh->errCode=0; + if (zh->res != zh->service->global_res) + res_close (zh->res); + zh->res = 0; +} + +static int zebra_select_register (ZebraHandle zh, const char *new_reg) +{ + ASSERTZH; + zh->errCode=0; + if (zh->res && strcmp (zh->reg_name, new_reg) == 0) + return 0; + if (!zh->res) + { + assert (zh->reg == 0); + assert (*zh->reg_name == 0); + } + else + { + if (zh->reg) + { + resultSetInvalidate (zh); + zebra_register_close (zh->service, zh->reg); + zh->reg = 0; + } + zebra_close_res(zh); + } + xfree (zh->reg_name); + zh->reg_name = xstrdup (new_reg); + + xfree (zh->path_reg); + zh->path_reg = 0; + if (zh->service->path_root) + { + zh->path_reg = xmalloc (strlen(zh->service->path_root) + + strlen(zh->reg_name) + 3); + strcpy (zh->path_reg, zh->service->path_root); + if (*zh->reg_name) + { + strcat (zh->path_reg, "/"); + strcat (zh->path_reg, zh->reg_name); + } + } + zh->res = zebra_open_res (zh); + + if (zh->lock_normal) + zebra_lock_destroy (zh->lock_normal); + zh->lock_normal = 0; + + if (zh->lock_shadow) + zebra_lock_destroy (zh->lock_shadow); + zh->lock_shadow = 0; + + if (zh->res) + { + char fname[512]; + const char *lock_area =res_get (zh->res, "lockDir"); + + if (!lock_area && zh->path_reg) + res_set (zh->res, "lockDir", zh->path_reg); + sprintf (fname, "norm.%s.LCK", zh->reg_name); + zh->lock_normal = + zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0); + + sprintf (fname, "shadow.%s.LCK", zh->reg_name); + zh->lock_shadow = + zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0); + + } + return 1; +} + void map_basenames_func (void *vp, const char *name, const char *value) { struct map_baseinfo *p = (struct map_baseinfo *) vp; @@ -396,7 +629,7 @@ void map_basenames_func (void *vp, const char *name, const char *value) return ; no--; for (i = 0; inum_bases; i++) - if (p->basenames[i] && !strcmp (p->basenames[i], fromdb)) + if (p->basenames[i] && !STRCASECMP (p->basenames[i], fromdb)) { p->basenames[i] = 0; for (i = 0; i < no; i++) @@ -416,6 +649,9 @@ void map_basenames (ZebraHandle zh, ODR stream, struct map_baseinfo info; struct map_baseinfo *p = &info; int i; + ASSERTZH; + yaz_log(LOG_API,"map_basenames "); + zh->errCode=0; info.zh = zh; info.num_bases = *num_bases; @@ -426,7 +662,7 @@ void map_basenames (ZebraHandle zh, ODR stream, odr_malloc (stream, sizeof(*info.new_basenames) * info.new_num_max); info.mem = stream->mem; - res_trav (zh->service->res, "mapdb", &info, map_basenames_func); + res_trav (zh->service->global_res, "mapdb", &info, map_basenames_func); for (i = 0; inum_bases; i++) if (p->basenames[i] && p->new_num_bases < p->new_num_max) @@ -440,31 +676,153 @@ void map_basenames (ZebraHandle zh, ODR stream, 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) +int zebra_select_database (ZebraHandle zh, const char *basename) +{ + ASSERTZH; + yaz_log(LOG_API,"zebra_select_database %s",basename); + zh->errCode=0; + return zebra_select_databases (zh, 1, &basename); +} + +int zebra_select_databases (ZebraHandle zh, int num_bases, + const char **basenames) +{ + int i; + const char *cp; + int len = 0; + char *new_reg = 0; + ASSERTZH; + yaz_log(LOG_API,"zebra_select_databases n=%d [0]=%s", + num_bases,basenames[0]); + zh->errCode=0; + + if (num_bases < 1) + { + zh->errCode = 23; + return -1; + } + for (i = 0; i < zh->num_basenames; i++) + xfree (zh->basenames[i]); + xfree (zh->basenames); + + zh->num_basenames = num_bases; + zh->basenames = xmalloc (zh->num_basenames * sizeof(*zh->basenames)); + for (i = 0; i < zh->num_basenames; i++) + zh->basenames[i] = xstrdup (basenames[i]); + + cp = strrchr(basenames[0], '/'); + if (cp) + { + len = cp - basenames[0]; + new_reg = xmalloc (len + 1); + memcpy (new_reg, basenames[0], len); + new_reg[len] = '\0'; + } + else + new_reg = xstrdup (""); + for (i = 1; ierrCode = 23; + return -1; + } + if (len != cp1 - basenames[i] || + memcmp (basenames[i], new_reg, len)) + { + zh->errCode = 23; + return -1; + } + } + else + { + if (cp1) + { + zh->errCode = 23; + return -1; + } + } + } + zebra_select_register (zh, new_reg); + xfree (new_reg); + if (!zh->res) + { + zh->errCode = 109; + return -1; + } + if (!zh->lock_normal || !zh->lock_shadow) + { + zh->errCode = 2; + return -1; + } + return 0; +} + +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"); + zh->errCode=0; zh->hits = 0; + *hits = 0; + if (zebra_begin_read (zh)) - return; - map_basenames (zh, stream, &num_bases, &basenames); - resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname); + return 1; - zebra_end_read (zh); + zebra_livcode_transform(zh, query); - logf(LOG_APP,"SEARCH:%d:",zh->hits); + resultSetAddRPN (zh, odr_extract_mem(o), query, + zh->num_basenames, zh->basenames, setname); + + zebra_end_read (zh); + max = res_get (zh->res, "maxhits"); + if (max) + maxhits=atoi(max); + else { + int i=0; + maxhits=INT_MAX; + while (maxhits>100) { maxhits/=10; i++;} + while (i--) maxhits *= 10; + } + if (zh->hits > maxhits) { /* too large for yaz to handle */ + logf(LOG_LOG,"limiting hits to "ZINT_FORMAT, maxhits); + *hits=maxhits; /* round it down to two digits, to look like rounded */ + } + else + *hits = zh->hits; + return 0; } -void zebra_records_retrieve (ZebraHandle zh, ODR stream, +int zebra_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; + int i, *pos_array, ret = 0; + ASSERTZH; + yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs); + zh->errCode=0; + + if (!zh->res) + { + zh->errCode = 30; + zh->errString = odr_strdup (stream, setname); + return -1; + } + + zh->errCode = 0; if (zebra_begin_read (zh)) - return; + return -1; pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); for (i = 0; ierrCode = 30; zh->errString = nmem_strdup (stream->mem, setname); + ret = -1; } else { @@ -504,7 +863,8 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, sprintf (num_str, "%d", pos_array[i]); zh->errCode = 13; - zh->errString = nmem_strdup (stream->mem, num_str); + zh->errString = odr_strdup (stream, num_str); + ret = -1; break; } } @@ -512,37 +872,44 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, } zebra_end_read (zh); xfree (pos_array); + return ret; } -void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, +int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, oid_value attributeset, - int num_bases, char **basenames, int *position, int *num_entries, ZebraScanEntry **entries, int *is_partial) { + ASSERTZH; + yaz_log(LOG_API,"zebra_scan"); + zh->errCode=0; if (zebra_begin_read (zh)) { *entries = 0; *num_entries = 0; - return; + return 1; } - map_basenames (zh, stream, &num_bases, &basenames); rpn_scan (zh, stream, zapt, attributeset, - num_bases, basenames, position, - num_entries, entries, is_partial); + zh->num_basenames, zh->basenames, position, + num_entries, entries, is_partial, 0, 0); zebra_end_read (zh); + return 0; } -void zebra_sort (ZebraHandle zh, ODR stream, +int zebra_sort (ZebraHandle zh, ODR stream, int num_input_setnames, const char **input_setnames, const char *output_setname, Z_SortKeySpecList *sort_sequence, int *sort_status) { + ASSERTZH; + yaz_log(LOG_API,"zebra_sort"); + zh->errCode=0; if (zebra_begin_read (zh)) - return; + return 1; resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, output_setname, sort_sequence, sort_status); zebra_end_read(zh); + return 0; } int zebra_deleleResultSet(ZebraHandle zh, int function, @@ -550,14 +917,17 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, int *statuses) { int i, status; + ASSERTZH; + yaz_log(LOG_API,"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; } @@ -571,61 +941,100 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, int zebra_errCode (ZebraHandle zh) { - return zh->errCode; + if (zh) + { + yaz_log(LOG_API,"zebra_errCode: %d",zh->errCode); + return zh->errCode; + } + yaz_log(LOG_API,"zebra_errCode: o"); + return 0; } const char *zebra_errString (ZebraHandle zh) { - return diagbib1_str (zh->errCode); + const char *e=""; + if (zh) + e= diagbib1_str (zh->errCode); + yaz_log(LOG_API,"zebra_errString: %s",e); + return e; } char *zebra_errAdd (ZebraHandle zh) { - return zh->errString; + char *a=""; + if (zh) + a= zh->errString; + yaz_log(LOG_API,"zebra_errAdd: %s",a); + return a; } -int zebra_hits (ZebraHandle zh) +void zebra_clearError(ZebraHandle zh) { - return zh->hits; + if (zh) + { + zh->errCode=0; + zh->errString=""; + } } -int zebra_auth (ZebraService zh, const char *user, const char *pass) +int zebra_auth (ZebraHandle zh, const char *user, const char *pass) { - if (!zh->passwd_db || !passwd_db_auth (zh->passwd_db, user, pass)) - { - logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS"); - return 0; - } + const char *p; + char u[40]; + ZebraService zs; + + ASSERTZH; + zh->errCode=0; + zs= zh->service; + + sprintf(u, "perm.%.30s", user ? user : "anonymous"); + p = res_get(zs->global_res, u); + xfree (zh->user_perm); + zh->user_perm = xstrdup(p ? p : "r"); - logf(LOG_APP,"AUTHFAIL:%s", user?user:"ANONYMOUS"); + /* users that don't require a password .. */ + if (zh->user_perm && strchr(zh->user_perm, 'a')) + return 0; + + if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass)) + return 0; return 1; } -void zebra_admin_import_begin (ZebraHandle zh, const char *database) +int zebra_admin_import_begin (ZebraHandle zh, const char *database, + const char *record_type) { - zebra_begin_trans (zh); - xfree (zh->admin_databaseName); - zh->admin_databaseName = xstrdup(database); + ASSERTZH; + yaz_log(LOG_API,"zebra_admin_import_begin db=%s rt=%s", + database, record_type); + zh->errCode=0; + if (zebra_select_database(zh, database)) + return 1; + if (zebra_begin_trans (zh, 1)) + return 1; + return 0; } -void zebra_admin_import_end (ZebraHandle zh) +int zebra_admin_import_end (ZebraHandle zh) { + ASSERTZH; + yaz_log(LOG_API,"zebra_admin_import_end"); + zh->errCode=0; zebra_end_trans (zh); + return 0; } -void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) +int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { - int sysno; + SYSNO sysno; int i; - if (zh->service->active < 2) - return; + ASSERTZH; + yaz_log(LOG_API,"zebra_admin_import_segment"); + zh->errCode=0; 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) { @@ -637,46 +1046,178 @@ void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) oct->buf); sysno = 0; - extract_rec_in_mem (zh, "grs.sgml", + + zebra_update_record(zh, + 0, /* record Type */ + &sysno, + 0, /* match */ + 0, /* fname */ oct->buf, oct->len, - databaseName, - 0 /* delete_flag */, - 0 /* test_mode */, - &sysno /* sysno */, - 1 /* store_keys */, - 1 /* store_data */, - 0 /* match criteria */); + 0); } } } + return 0; } -void zebra_admin_create (ZebraHandle zh, const char *database) +int zebra_admin_exchange_record (ZebraHandle zh, + const char *rec_buf, + size_t rec_len, + const char *recid_buf, size_t recid_len, + int action) + /* 1 = insert. Fail it already exists */ + /* 2 = replace. Fail it does not exist */ + /* 3 = delete. Fail if does not exist */ + /* 4 = update. Insert/replace */ { - ZebraService zs; + SYSNO sysno = 0; + char *rinfo = 0; + char recid_z[256]; + ASSERTZH; + yaz_log(LOG_API,"zebra_admin_exchange_record ac=%d", action); + zh->errCode=0; + + if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) + return -1; + memcpy (recid_z, recid_buf, recid_len); + recid_z[recid_len] = 0; - zebra_begin_trans (zh); + if (zebra_begin_trans(zh, 1)) + return -1; - zs = zh->service; - /* announce database */ - if (zebraExplain_newDatabase (zh->service->zei, database, 0 - /* explainDatabase */)) + rinfo = dict_lookup (zh->reg->matchDict, recid_z); + if (rinfo) { - zh->errCode = 224; - zh->errString = "Database already exist"; - } - zebra_end_trans (zh); -} + if (action == 1) /* fail if insert */ + { + zebra_end_trans(zh); + return -1; + } -int zebra_string_norm (ZebraHandle zh, unsigned reg_id, - const char *input_str, int input_len, - char *output_str, int output_len) -{ - WRBUF wrbuf; - if (!zh->service->zebra_maps) - return -1; - wrbuf = zebra_replace(zh->service->zebra_maps, reg_id, "", - input_str, input_len); + memcpy (&sysno, rinfo+1, sizeof(sysno)); + } + else + { + if (action == 2 || action == 3) /* fail if delete or update */ + { + zebra_end_trans(zh); + return -1; + } + action = 1; /* make it an insert (if it's an update).. */ + } + buffer_extract_record (zh, rec_buf, rec_len, + action == 3 ? 1 : 0 /* delete flag */, + 0, /* test mode */ + 0, /* recordType */ + &sysno, + 0, /* match */ + 0, /* fname */ + 0, /* force update */ + 1 /* allow update */ + ); + if (action == 1) + { + dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno); + } + else if (action == 3) + { + dict_delete (zh->reg->matchDict, recid_z); + } + zebra_end_trans(zh); + return 0; +} + +int delete_w_handle(const char *info, void *handle) +{ + ZebraHandle zh = (ZebraHandle) handle; + ISAMC_P pos; + + if (*info == sizeof(pos)) + { + memcpy (&pos, info+1, sizeof(pos)); + isamb_unlink(zh->reg->isamb, pos); + } + return 0; +} + +static int delete_SU_handle(void *handle, int ord) +{ + ZebraHandle zh = (ZebraHandle) handle; + char ord_buf[20]; + int ord_len; + + ord_len = key_SU_encode (ord, ord_buf); + ord_buf[ord_len] = '\0'; + + assert (zh->reg->isamb); + dict_delete_subtree(zh->reg->dict, ord_buf, + zh, delete_w_handle); + return 0; +} + +int zebra_drop_database (ZebraHandle zh, const char *database) +{ + int ret = 0; + ASSERTZH; + yaz_log(LOG_API,"zebra_drop_database"); + zh->errCode = 0; + + if (zebra_select_database (zh, database)) + return -1; + if (zebra_begin_trans (zh, 1)) + return -1; + if (zh->reg->isamb) + { + zebraExplain_curDatabase (zh->reg->zei, database); + + zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle); + zebraExplain_removeDatabase(zh->reg->zei, zh); + } + else + { + yaz_log(LOG_WARN, "drop database only supported for isam:b"); + ret = -1; + } + zebra_end_trans (zh); + return ret; +} + +int zebra_create_database (ZebraHandle zh, const char *database) +{ + ASSERTZH; + yaz_log(LOG_API,"zebra_create_database"); + zh->errCode=0; + + if (zebra_select_database (zh, database)) + return -1; + if (zebra_begin_trans (zh, 1)) + return -1; + + /* announce database */ + if (zebraExplain_newDatabase (zh->reg->zei, database, 0 + /* explainDatabase */)) + { + zebra_end_trans (zh); + zh->errCode = 224; + zh->errString = "database already exist"; + return -1; + } + zebra_end_trans (zh); + return 0; +} + +int zebra_string_norm (ZebraHandle zh, unsigned reg_id, + const char *input_str, int input_len, + char *output_str, int output_len) +{ + WRBUF wrbuf; + ASSERTZH; + yaz_log(LOG_API,"zebra_string_norm "); + zh->errCode=0; + if (!zh->reg->zebra_maps) + return -1; + wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "", + input_str, input_len); if (!wrbuf) return -2; if (wrbuf_len(wrbuf) >= output_len) @@ -688,18 +1229,39 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id, } -void zebra_set_state (int val, int seqno) +int zebra_set_state (ZebraHandle zh, int val, int seqno) { + char state_fname[256]; + char *fname; long p = getpid(); - FILE *f = fopen ("state.LCK", "w"); + FILE *f; + ASSERTZH; + yaz_log(LOG_API,"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); fprintf (f, "%c %d %ld\n", val, seqno, p); fclose (f); + xfree (fname); + return 0; } -void zebra_get_state (char *val, int *seqno) +int zebra_get_state (ZebraHandle zh, char *val, int *seqno) { - FILE *f = fopen ("state.LCK", "r"); - + char state_fname[256]; + char *fname; + FILE *f; + + ASSERTZH; + yaz_log(LOG_API,"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); + f = fopen (fname, "r"); *val = 'o'; *seqno = 0; @@ -708,230 +1270,427 @@ void zebra_get_state (char *val, int *seqno) fscanf (f, "%c %d", val, seqno); fclose (f); } + xfree (fname); + return 0; } -static int zebra_begin_read (ZebraHandle zh) +int zebra_begin_read (ZebraHandle zh) { - int dirty = 0; - char val; - int seqno; - - zebra_flush_reg (zh); - - (zh->trans_no)++; - - if (zh->trans_no != 1) - return 0; + return zebra_begin_trans(zh, 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; +int zebra_end_read (ZebraHandle zh) +{ + return zebra_end_trans(zh); +} - if (val == 'c') - zebra_lock_r (zh->lock_shadow); - else - zebra_lock_r (zh->lock_normal); +static void read_res_for_transaction(ZebraHandle zh) +{ + const char *group = res_get(zh->res, "group"); + const char *v; - zh->last_val = val; - zh->seqno = seqno; + zh->m_group = group; + v = res_get_prefix(zh->res, "followLinks", group, "1"); + zh->m_follow_links = atoi(v); - zebra_register_deactivate (zh); + zh->m_record_id = res_get_prefix(zh->res, "recordId", group, 0); + zh->m_record_type = res_get_prefix(zh->res, "recordType", group, 0); - zebra_register_activate (zh, 0, val == 'c' ? 1 : 0); - return 0; -} + v = res_get_prefix(zh->res, "storeKeys", group, "1"); + zh->m_store_keys = atoi(v); -static void zebra_end_read (ZebraHandle zh) -{ - (zh->trans_no)--; + v = res_get_prefix(zh->res, "storeData", group, "1"); + zh->m_store_data = atoi(v); - if (zh->trans_no != 0) - return; + v = res_get_prefix(zh->res, "explainDatabase", group, "0"); + zh->m_explain_database = atoi(v); - zebra_unlock (zh->lock_normal); - zebra_unlock (zh->lock_shadow); + v = res_get_prefix(zh->res, "openRW", group, "1"); + zh->m_flag_rw = atoi(v); + + v = res_get_prefix(zh->res, "fileVerboseLimit", group, "100000"); + zh->m_file_verbose_limit = atoi(v); } -void zebra_begin_trans (ZebraHandle zh) +int zebra_begin_trans (ZebraHandle zh, int rw) { - int pass; - int seqno = 0; - char val = '?'; - const char *rval; - - (zh->trans_no++); - if (zh->trans_no != 1) + if (!zh->res) { - return; + zh->errCode = 2; + zh->errString = "zebra_begin_trans: no database selected"; + return -1; } + ASSERTZHRES; + yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw); - yaz_log (LOG_LOG, "zebra_begin_trans"); -#if HAVE_SYS_TIMES_H - times (&zh->tms1); -#endif - - /* lock */ - rval = res_get (zh->service->res, "shadow"); + if (zh->user_perm) + { + if (rw && !strchr(zh->user_perm, 'w')) + { + zh->errCode = 223; + zh->errString = 0; + return -1; + } + } - for (pass = 0; pass < 2; pass++) + assert (zh->res); + if (rw) { - 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); - } + int pass; + int seqno = 0; + char val = '?'; + const char *rval = 0; - zebra_get_state (&val, &seqno); - if (val == 'c') + (zh->trans_no++); + if (zh->trans_w_no) + { + read_res_for_transaction(zh); + return 0; + } + if (zh->trans_no != 1) { - yaz_log (LOG_LOG, "previous transaction didn't finish commit"); - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); - zebra_commit (zh); - continue; + zh->errCode = 2; + zh->errString = "zebra_begin_trans: write trans not allowed within read trans"; + return -1; } - else if (val == 'd') + if (zh->reg) + { + resultSetInvalidate (zh); + zebra_register_close (zh->service, zh->reg); + } + zh->trans_w_no = zh->trans_no; + + zh->errCode=0; + + zh->records_inserted = 0; + zh->records_updated = 0; + zh->records_deleted = 0; + zh->records_processed = 0; + +#if HAVE_SYS_TIMES_H + times (&zh->tms1); +#endif + /* lock */ + if (zh->shadow_enable) + rval = res_get (zh->res, "shadow"); + + for (pass = 0; pass < 2; pass++) { 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); + zebra_lock_r (zh->lock_normal); + zebra_lock_w (zh->lock_shadow); } else { - yaz_log (LOG_WARN, "your previous transaction didn't finish"); + zebra_lock_w (zh->lock_normal); + zebra_lock_w (zh->lock_shadow); + } + + zebra_get_state (zh, &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->res, "shadow"), + zh->path_reg); + 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 -1; + } + zebra_set_state (zh, 'd', seqno); + + zh->reg = zebra_register_open (zh->service, zh->reg_name, + 1, rval ? 1 : 0, zh->res, + zh->path_reg); + if (zh->reg) + zh->reg->seqno = seqno; + else + { + zebra_set_state (zh, 'o', seqno); + + zebra_unlock (zh->lock_shadow); + zebra_unlock (zh->lock_normal); + + zh->trans_no--; + zh->trans_w_no = 0; + + zh->errCode = 2; + zh->errString = "zebra_begin_trans: cannot open register"; + yaz_log(LOG_FATAL, zh->errString); + return -1; } - break; } - if (pass == 2) + else { - yaz_log (LOG_FATAL, "zebra_begin_trans couldn't finish commit"); - abort(); - return; + int dirty = 0; + char val; + int seqno; + + (zh->trans_no)++; + + if (zh->trans_no != 1) + { + zebra_flush_reg (zh); + return 0; + } + zh->errCode=0; +#if HAVE_SYS_TIMES_H + times (&zh->tms1); +#endif + if (!zh->res) + { + (zh->trans_no)--; + zh->errCode = 109; + return -1; + } + if (!zh->lock_normal || !zh->lock_shadow) + { + (zh->trans_no)--; + zh->errCode = 2; + return -1; + } + zebra_get_state (zh, &val, &seqno); + if (val == 'd') + val = 'o'; + + if (!zh->reg) + dirty = 1; + else if (seqno != zh->reg->seqno) + { + yaz_log (LOG_LOG, "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", + val, zh->reg->last_val); + dirty = 1; + } + if (!dirty) + return 0; + + if (val == 'c') + zebra_lock_r (zh->lock_shadow); + else + zebra_lock_r (zh->lock_normal); + + if (zh->reg) + { + resultSetInvalidate (zh); + zebra_register_close (zh->service, zh->reg); + } + zh->reg = zebra_register_open (zh->service, zh->reg_name, + 0, val == 'c' ? 1 : 0, + zh->res, zh->path_reg); + if (!zh->reg) + { + zebra_unlock (zh->lock_normal); + zebra_unlock (zh->lock_shadow); + zh->trans_no--; + zh->errCode = 109; + return -1; + } + zh->reg->last_val = val; + zh->reg->seqno = seqno; } - zebra_set_state ('d', seqno); + read_res_for_transaction(zh); + return 0; +} - zebra_register_activate (zh, 1, rval ? 1 : 0); - zh->service->matchDict = dict_open (zh->service->bfs, GMATCH_DICT, - 50, 1, 0); - zh->seqno = seqno; +int zebra_end_trans (ZebraHandle zh) +{ + ZebraTransactionStatus dummy; + yaz_log(LOG_API,"zebra_end_trans"); + return zebra_end_transaction(zh, &dummy); } -void zebra_end_trans (ZebraHandle zh) +int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) { 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"); + ASSERTZH; + yaz_log(LOG_API,"zebra_end_transaction"); - zebra_flush_reg (zh); + status->processed = 0; + status->inserted = 0; + status->updated = 0; + status->deleted = 0; + status->utime = 0; + status->stime = 0; - zebra_register_deactivate (zh); - - zebra_get_state (&val, &seqno); - if (val != 'd') + if (!zh->res || !zh->reg) { - BFiles bfs = bfs_create (res_get (zh->service->res, "shadow")); - bf_commitClean (bfs, rval); - bfs_destroy (bfs); + zh->errCode = 2; + zh->errString = "zebra_end_trans: no open transaction"; + return -1; } - if (!rval) - seqno++; - zebra_set_state ('o', seqno); + if (zh->trans_no != zh->trans_w_no) + { + zh->trans_no--; + if (zh->trans_no != 0) + return 0; - zebra_unlock (zh->lock_shadow); - zebra_unlock (zh->lock_normal); + /* release read lock */ + + zebra_unlock (zh->lock_normal); + zebra_unlock (zh->lock_shadow); + } + else + { /* release write lock */ + zh->trans_no--; + zh->trans_w_no = 0; + + yaz_log (LOG_LOG, "zebra_end_trans"); + rval = res_get (zh->res, "shadow"); + + zebraExplain_runNumberIncrement (zh->reg->zei, 1); + + zebra_flush_reg (zh); + + resultSetInvalidate (zh); + zebra_register_close (zh->service, zh->reg); + zh->reg = 0; + + yaz_log (LOG_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); + + status->processed = zh->records_processed; + status->inserted = zh->records_inserted; + status->updated = zh->records_updated; + status->deleted = zh->records_deleted; + + zebra_get_state (zh, &val, &seqno); + if (val != 'd') + { + BFiles bfs = bfs_create (rval, zh->path_reg); + yaz_log (LOG_LOG, "deleting shadow stuff val=%c", val); + bf_commitClean (bfs, rval); + bfs_destroy (bfs); + } + if (!rval) + seqno++; + zebra_set_state (zh, '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)); - + (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), + (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); + + status->utime = (long) (zh->tms2.tms_utime - zh->tms1.tms_utime); + status->stime = (long) (zh->tms2.tms_stime - zh->tms1.tms_stime); #endif + return 0; } -void zebra_repository_update (ZebraHandle zh) +int zebra_repository_update (ZebraHandle zh, const char *path) { - zebra_begin_trans (zh); - logf (LOG_LOG, "updating %s", zh->rGroup.path); - repositoryUpdate (zh); - zebra_end_trans (zh); + ASSERTZH; + zh->errCode=0; + logf (LOG_LOG|LOG_API, "updating %s", path); + repositoryUpdate (zh, path); + return zh->errCode; } -void zebra_repository_delete (ZebraHandle zh) +int zebra_repository_delete (ZebraHandle zh, const char *path) { - logf (LOG_LOG, "deleting %s", zh->rGroup.path); - repositoryDelete (zh); + ASSERTZH; + zh->errCode=0; + logf (LOG_LOG|LOG_API, "deleting %s", path); + repositoryDelete (zh, path); + return zh->errCode; } -void zebra_repository_show (ZebraHandle zh) +int zebra_repository_show (ZebraHandle zh, const char *path) { - repositoryShow (zh); + ASSERTZH; + yaz_log(LOG_API,"zebra_repository_show"); + zh->errCode=0; + repositoryShow (zh, path); + return zh->errCode; } -void zebra_commit (ZebraHandle zh) +static int zebra_commit_ex (ZebraHandle zh, int clean_only) { int seqno; char val; - const char *rval = res_get (zh->service->res, "shadow"); + const char *rval; BFiles bfs; + ASSERTZH; + zh->errCode=0; + if (!zh->res) + { + zh->errCode = 109; + return -1; + } + rval = res_get (zh->res, "shadow"); if (!rval) { logf (LOG_WARN, "Cannot perform commit"); logf (LOG_WARN, "No shadow area defined"); - return; + return 0; } zebra_lock_w (zh->lock_normal); zebra_lock_r (zh->lock_shadow); - bfs = bfs_create (res_get (zh->service->res, "register")); + bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg); - zebra_get_state (&val, &seqno); + zebra_get_state (zh, &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); + if (clean_only) + zebra_set_state (zh, 'd', seqno); + else + { + zebra_set_state (zh, 'c', seqno); + + logf (LOG_LOG, "commit start"); + bf_commitExec (bfs); #ifndef WIN32 - sync (); + sync (); #endif + } logf (LOG_LOG, "commit clean"); bf_commitClean (bfs, rval); seqno++; - zebra_set_state ('o', seqno); + zebra_set_state (zh, 'o', seqno); } else { @@ -941,42 +1700,394 @@ void zebra_commit (ZebraHandle zh) zebra_unlock (zh->lock_shadow); zebra_unlock (zh->lock_normal); + return 0; +} + +int zebra_clean (ZebraHandle zh) +{ + yaz_log(LOG_API,"zebra_clean"); + return zebra_commit_ex(zh, 1); +} + +int zebra_commit (ZebraHandle zh) +{ + yaz_log(LOG_API,"zebra_commit"); + return zebra_commit_ex(zh, 0); } -void zebra_init (ZebraHandle zh) +int zebra_init (ZebraHandle zh) { - const char *rval = res_get (zh->service->res, "shadow"); + const char *rval; BFiles bfs = 0; + ASSERTZH; + yaz_log(LOG_API,"zebra_init"); + zh->errCode=0; - bfs = bfs_create (res_get (zh->service->res, "register")); + if (!zh->res) + { + zh->errCode = 109; + return -1; + } + rval = res_get (zh->res, "shadow"); + + bfs = bfs_create (res_get (zh->service->global_res, "register"), + zh->path_reg); if (rval && *rval) bf_cache (bfs, rval); bf_reset (bfs); bfs_destroy (bfs); - zebra_set_state ('o', 0); + zebra_set_state (zh, 'o', 0); + return 0; } -void zebra_compact (ZebraHandle zh) +int zebra_compact (ZebraHandle zh) { - BFiles bfs = bfs_create (res_get (zh->service->res, "register")); + BFiles bfs; + ASSERTZH; + yaz_log(LOG_API,"zebra_compact"); + zh->errCode=0; + if (!zh->res) + { + zh->errCode = 109; + return -1; + } + bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg); inv_compact (bfs); bfs_destroy (bfs); + return 0; } -int zebra_record_insert (ZebraHandle zh, const char *buf, int len) +int zebra_result (ZebraHandle zh, int *code, char **addinfo) { - 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; + ASSERTZH; + yaz_log(LOG_API,"zebra_result"); + *code = zh->errCode; + *addinfo = zh->errString; + return 0; +} + +int zebra_shadow_enable (ZebraHandle zh, int value) +{ + ASSERTZH; + yaz_log(LOG_API,"zebra_shadow_enable"); + zh->errCode=0; + zh->shadow_enable = value; + return 0; +} + +int zebra_record_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??? + */ + + 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); + 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); + + 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); + zh->errCode=0; + res_set(zh->res, name, value); + return 0; +} + +const char *zebra_get_resource(ZebraHandle zh, + const char *name, const char *defaultvalue) +{ + const char *v; + ASSERTZH; + v= res_get_def( zh->res, name, (char *)defaultvalue); + zh->errCode=0; + yaz_log(LOG_API,"zebra_get_resource %s:%s",name,v); + return v; +} + +/* moved from zebra_api_ext.c by pop */ +/* FIXME: Should this really be public??? -Heikki */ + +int zebra_trans_no (ZebraHandle zh) +{ + ASSERTZH; + yaz_log(LOG_API,"zebra_trans_no"); + return zh->trans_no; +} + +int zebra_get_shadow_enable (ZebraHandle zh) +{ + yaz_log(LOG_API,"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); + zh->shadow_enable = value; + return 0; +} + +/* almost the same as zebra_records_retrieve ... but how did it work? + I mean for multiple records ??? CHECK ??? */ +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); +} + + +/* --------------------------------------------------------------------------- + Record insert(=update), delete + + If sysno is provided, then it's used to identify the record. + If not, and match_criteria is provided, then sysno is guessed + If not, and a record is provided, then sysno is got from there +NOTE: Now returns 0 at success and updates sysno, which is an int* + 20-jun-2003 Heikki +*/ + +int zebra_add_record(ZebraHandle zh, + const char *buf, int buf_size) +{ + 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, + 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=" ZINT_FORMAT, *sysno); + + if (buf_size < 1) buf_size = strlen(buf); + + if (zebra_begin_trans(zh, 1)) + return 1; + res = buffer_extract_record (zh, buf, buf_size, + 0, /* delete_flag */ + 0, /* test_mode */ + recordType, + sysno, + match, fname, + 0, + 0); /* allow_update */ + zebra_end_trans(zh); + return res; } + +int zebra_update_record (ZebraHandle zh, + const char *recordType, + SYSNO* sysno, const char *match, const char *fname, + const char *buf, int buf_size, + int force_update) +{ + int res; + + yaz_log(LOG_API,"zebra_update_record sysno=" ZINT_FORMAT, *sysno); + + if (buf_size < 1) buf_size = strlen(buf); + + if (zebra_begin_trans(zh, 1)) + return 1; + res = buffer_extract_record (zh, buf, buf_size, + 0, /* delete_flag */ + 0, /* test_mode */ + recordType, + sysno, + match, fname, + force_update, + 1); /* allow_update */ + zebra_end_trans(zh); + return res; +} + +int zebra_delete_record (ZebraHandle zh, + const char *recordType, + 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=" ZINT_FORMAT, *sysno); + + if (buf_size < 1) buf_size = strlen(buf); + + if (zebra_begin_trans(zh, 1)) + return 1; + res = buffer_extract_record (zh, buf, buf_size, + 1, /* delete_flag */ + 0, /* test_mode */ + recordType, + sysno, + match,fname, + force_update, + 1); /* allow_update */ + zebra_end_trans(zh); + return res; +} + +/* --------------------------------------------------------------------------- + Searching +*/ + +int zebra_search_PQF (ZebraHandle zh, const char *pqf_query, + const char *setname, int *numhits) +{ + int hits = 0; + int res=-1; + Z_RPNQuery *query; + ODR odr = odr_createmem(ODR_ENCODE); + + yaz_log(LOG_API,"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); + else + res=zebra_search_RPN (zh, odr, query, setname, &hits); + + odr_destroy(odr); + + yaz_log(LOG_API,"Hits: %d",hits); + + if (numhits) + *numhits=hits; + + return res; +} + +/* --------------------------------------------------------------------------- + Sort - a simplified interface, with optional read locks. +*/ +int zebra_sort_by_specstr (ZebraHandle zh, + ODR stream, + const char *sort_spec, + const char *output_setname, + const char **input_setnames) +{ + 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) "); + if (!sort_sequence) + { + logf(LOG_WARN,"invalid sort specs '%s'", sort_spec); + zh->errCode = 207; + return -1; + } + + /* we can do this, since the perl typemap code for char** will + put a NULL at the end of list */ + while (input_setnames[num_input_setnames]) num_input_setnames++; + + if (zebra_begin_read (zh)) + return -1; + + resultSetSort (zh, stream->mem, num_input_setnames, input_setnames, + output_setname, sort_sequence, &sort_status); + + zebra_end_read(zh); + return sort_status; +} +