/*
- * Copyright (C) 1995-1998, Index Data
+ * Copyright (C) 1995-2002, Index Data
* All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: zebraapi.c,v $
- * 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.53 2002-04-05 08:46:26 adam Exp $
*/
+#include <assert.h>
#include <stdio.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#include <process.h>
+#include <direct.h>
#else
#include <unistd.h>
#endif
-#include <diagbib1.h>
-#include "zserver.h"
+#include <yaz/diagbib1.h>
+#include "index.h"
+#include <charmap.h>
+
+static Res zebra_open_res (ZebraHandle zh);
+static void zebra_close_res (ZebraHandle zh);
+
+static void zebra_chdir (ZebraService zh)
+{
+ const char *dir = res_get (zh->global_res, "chdir");
+ if (!dir)
+ return;
+ logf (LOG_DEBUG, "chdir %s", dir);
+#ifdef WIN32
+ _chdir(dir);
+#else
+ chdir (dir);
+#endif
+}
+
+static void zebra_flush_reg (ZebraHandle zh)
+{
+ zebraExplain_flush (zh->reg->zei, 1, zh);
+
+ extract_flushWriteKeys (zh);
+ zebra_index_merge (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);
+
+static int zebra_begin_read (ZebraHandle zh);
+static void zebra_end_read (ZebraHandle zh);
-static int zebra_register_lock (ZebraHandle zh)
+ZebraHandle zebra_open (ZebraService zs)
{
- time_t lastChange;
- int state = zebra_server_lock_get_state(zh, &lastChange);
+ ZebraHandle zh;
- switch (state)
+ if (!zs)
+ return 0;
+
+ zh = (ZebraHandle) xmalloc (sizeof(*zh));
+ yaz_log (LOG_LOG, "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->reg_name = xstrdup ("");
+ zh->path_reg = 0;
+ zh->num_basenames = 0;
+ zh->basenames = 0;
+
+ zh->trans_no = 0;
+
+ zh->lock_normal = 0;
+ zh->lock_shadow = 0;
+
+ zh->admin_databaseName = 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)
+{
+ Res res;
+
+ yaz_log (LOG_LOG, "zebra_start %s", configName);
+
+ if (!(res = res_open (configName, 0)))
+ yaz_log (LOG_WARN, "Cannot read resources `%s'", configName);
+ else
{
- case 'c':
- state = 1;
- break;
- default:
- state = 0;
+ ZebraService zh = xmalloc (sizeof(*zh));
+
+ yaz_log (LOG_LOG, "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;
}
- zebra_server_lock (zh, state);
-#if USE_TIMES
- times (&zh->tms1);
-#endif
- if (zh->registerState == state)
+ return 0;
+}
+
+static
+struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
+ int rw, int useshadow, Res res,
+ const char *reg_path)
+{
+ struct zebra_register *reg;
+ int record_compression = REC_COMPRESS_NONE;
+ char *recordCompression = 0;
+
+ reg = xmalloc (sizeof(*reg));
+
+ assert (name);
+ reg->name = xstrdup (name);
+
+ reg->seqno = 0;
+ reg->last_val = 0;
+
+ assert (res);
+
+ yaz_log (LOG_LOG, "zebra_register_open rw = %d useshadow=%d p=%p",
+ rw, useshadow, reg);
+
+ reg->dh = data1_create ();
+ if (!reg->dh)
+ return 0;
+ reg->bfs = bfs_create (res_get (res, "register"), reg_path);
+ if (!reg->bfs)
{
- if (zh->registerChange >= lastChange)
- return 0;
- logf (LOG_LOG, "Register completely updated since last access");
+ data1_destroy(reg->dh);
+ return 0;
}
- else if (zh->registerState == -1)
- logf (LOG_LOG, "Reading register using state %d pid=%ld", state,
- (long) getpid());
- 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);
- dict_close (zh->dict);
- sortIdx_close (zh->sortIdx);
- if (zh->isam)
- is_close (zh->isam);
- if (zh->isamc)
- isc_close (zh->isamc);
- rec_close (&zh->records);
- }
- bf_cache (zh->bfs, state ? res_get (zh->res, "shadow") : NULL);
- zh->registerState = state;
- zh->records = rec_open (zh->bfs, 0);
- if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0)))
+ if (useshadow)
+ bf_cache (reg->bfs, res_get (res, "shadow"));
+ data1_set_tabpath (reg->dh, res_get(res, "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;
+
+ reg->records = 0;
+ reg->dict = 0;
+ reg->sortIdx = 0;
+ reg->isams = 0;
+ reg->matchDict = 0;
+ reg->isam = 0;
+ reg->isamc = 0;
+ reg->isamd = 0;
+ reg->zei = 0;
+ reg->matchDict = 0;
+
+ zebraRankInstall (reg, rank1_class);
+
+ 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 (!(reg->records = rec_open (reg->bfs, rw, record_compression)))
+ {
+ logf (LOG_WARN, "rec_open");
+ return 0;
+ }
+ if (rw)
+ {
+ reg->matchDict = dict_open (reg->bfs, GMATCH_DICT, 20, 1, 0);
+ }
+ if (!(reg->dict = dict_open (reg->bfs, FNAME_DICT, 40, rw, 0)))
{
logf (LOG_WARN, "dict_open");
- return -1;
+ return 0;
}
- if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0)))
+ if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw)))
{
logf (LOG_WARN, "sortIdx_open");
- return -1;
+ return 0;
}
- zh->isam = NULL;
- zh->isamc = NULL;
- if (!res_get_match (zh->res, "isam", "i", NULL))
+ if (res_get_match (res, "isam", "s", ISAM_DEFAULT))
{
- if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC,
- 0, key_isamc_m(zh->res))))
+ struct ISAMS_M_s isams_m;
+ if (!(reg->isams = isams_open (reg->bfs, FNAME_ISAMS, rw,
+ key_isams_m(res, &isams_m))))
{
- logf (LOG_WARN, "isc_open");
- return -1;
+ logf (LOG_WARN, "isams_open");
+ return 0;
}
-
}
- else
+ else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
{
- if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0,
- sizeof (struct it_key), zh->res)))
+ if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
+ sizeof (struct it_key), res)))
{
logf (LOG_WARN, "is_open");
- return -1;
+ return 0;
+ }
+ }
+ else if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
+ {
+ 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, "isc_open");
+ return 0;
}
}
- zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0);
+ else if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
+ {
+ struct ISAMD_M_s isamd_m;
+
+ if (!(reg->isamd = isamd_open (reg->bfs, FNAME_ISAMD,
+ rw, key_isamd_m(res, &isamd_m))))
+ {
+ logf (LOG_WARN, "isamd_open");
+ return 0;
+ }
+ }
+ reg->zei = zebraExplain_open (reg->records, reg->dh,
+ res, rw, reg,
+ explain_extract);
+ if (!reg->zei)
+ {
+ logf (LOG_WARN, "Cannot obtain EXPLAIN information");
+ return 0;
+ }
+ reg->active = 2;
+ yaz_log (LOG_LOG, "zebra_register_open ok p=%p", reg);
+ return reg;
+}
- return 0;
+void zebra_admin_shutdown (ZebraHandle zh)
+{
+ zebra_mutex_cond_lock (&zh->service->session_lock);
+ zh->service->stop_flag = 1;
+ zebra_mutex_cond_unlock (&zh->service->session_lock);
+}
+
+void zebra_admin_start (ZebraHandle zh)
+{
+ ZebraService zs = zh->service;
+ zh->errCode = 0;
+ zebra_mutex_cond_lock (&zs->session_lock);
+ zebra_mutex_cond_unlock (&zs->session_lock);
}
-static void zebra_register_unlock (ZebraHandle zh)
+static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
{
- static int waitSec = -1;
+ yaz_log(LOG_LOG, "zebra_register_close p=%p", reg);
+ reg->stop_flag = 0;
+ zebra_chdir (zs);
+ if (reg->records)
+ {
+ zebraExplain_close (reg->zei, 0);
+ dict_close (reg->dict);
+ if (reg->matchDict)
+ dict_close (reg->matchDict);
+ sortIdx_close (reg->sortIdx);
+ if (reg->isams)
+ isams_close (reg->isams);
+ if (reg->isam)
+ is_close (reg->isam);
+ if (reg->isamc)
+ isc_close (reg->isamc);
+ if (reg->isamd)
+ isamd_close (reg->isamd);
+ rec_close (®->records);
+ }
-#if USE_TIMES
- 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)
+ recTypes_destroy (reg->recTypes);
+ zebra_maps_close (reg->zebra_maps);
+ zebraRankDestroy (reg);
+ bfs_destroy (reg->bfs);
+ data1_destroy (reg->dh);
+
+ xfree (reg->key_buf);
+ xfree (reg->name);
+ xfree (reg);
+ yaz_log (LOG_LOG, "zebra_register_close 2");
+}
+
+void zebra_stop(ZebraService zs)
+{
+ if (!zs)
+ return ;
+ yaz_log (LOG_LOG, "zebra_stop");
+
+ zebra_mutex_cond_lock (&zs->session_lock);
+ while (zs->sessions)
{
- char *s = res_get (zh->res, "debugRequestWait");
- if (s)
- waitSec = atoi (s);
- else
- waitSec = 0;
+ zebra_close (zs->sessions);
}
-#ifdef WINDOWS
-#else
- if (waitSec > 0)
- sleep (waitSec);
-#endif
- if (zh->registerState != -1)
- zebra_server_unlock (zh, zh->registerState);
+
+ zebra_mutex_cond_unlock (&zs->session_lock);
+
+ zebra_mutex_cond_destroy (&zs->session_lock);
+
+ if (zs->passwd_db)
+ passwd_db_close (zs->passwd_db);
+
+ res_close (zs->global_res);
+ xfree (zs->configName);
+ xfree (zs->path_root);
+ xfree (zs);
}
-ZebraHandle zebra_open (const char *configName)
+void zebra_close (ZebraHandle zh)
{
- ZebraHandle zh = xmalloc (sizeof(*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->reg)
+ zebra_register_close (zh->service, zh->reg);
+ zebra_close_res (zh);
- if (!(zh->res = res_open (configName)))
+ 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)
{
- logf (LOG_WARN, "Failed to read resources `%s'", configName);
- return NULL;
+ assert (*sp);
+ if (*sp == zh)
+ {
+ *sp = (*sp)->next;
+ break;
+ }
+ sp = &(*sp)->next;
}
- zebra_server_lock_init (zh);
- zh->dh = data1_create ();
- zh->bfs = bfs_create (res_get (zh->res, "register"));
- bf_lockDir (zh->bfs, res_get (zh->res, "lockDir"));
- data1_set_tabpath (zh->dh, res_get(zh->res, "profilePath"));
- zh->sets = NULL;
- zh->registerState = -1; /* trigger open of registers! */
- zh->registerChange = 0;
- zh->recTypes = recTypes_init (zh->dh);
- recTypes_default_handlers (zh->recTypes);
+// if (!zs->sessions && zs->stop_flag)
+// zebra_register_deactivate(zs);
+ zebra_mutex_cond_unlock (&zs->session_lock);
+ xfree (zh->reg_name);
+ xfree (zh);
+ yaz_log (LOG_LOG, "zebra_close zh=%p end", zh);}
- zh->records = NULL;
- zh->zebra_maps = zebra_maps_open (zh->res);
- zh->rank_classes = NULL;
- zh->errCode = 0;
- zh->errString = 0;
-
- zebraRankInstall (zh, rank1_class);
+struct map_baseinfo {
+ ZebraHandle zh;
+ NMEM mem;
+ int num_bases;
+ char **basenames;
+ int new_num_bases;
+ char **new_basenames;
+ int new_num_max;
+};
- if (!res_get (zh->res, "passwd"))
- zh->passwd_db = NULL;
+static Res zebra_open_res (ZebraHandle zh)
+{
+ Res res = 0;
+ char fname[512];
+ if (zh->path_reg)
+ {
+ sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
+ res = res_open (fname, zh->service->global_res);
+ if (!res)
+ res = zh->service->global_res;
+ }
+ else if (*zh->reg_name == 0)
+ {
+ res = zh->service->global_res;
+ }
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_WARN, "no register root specified");
+ return 0; /* no path for register - fail! */
}
- return zh;
+ return res;
}
-void zebra_close (ZebraHandle zh)
+static void zebra_close_res (ZebraHandle zh)
{
- if (zh->records)
- {
- resultSetDestroy (zh);
- zebraExplain_close (zh->zei, 0, 0);
- dict_close (zh->dict);
- sortIdx_close (zh->sortIdx);
- if (zh->isam)
- is_close (zh->isam);
- if (zh->isamc)
- isc_close (zh->isamc);
- 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);
+ if (zh->res != zh->service->global_res)
+ res_close (zh->res);
+ zh->res = 0;
}
-void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode,
- Z_RPNQuery *query, int num_bases, char **basenames,
- const char *setname)
+static int zebra_select_register (ZebraHandle zh, const char *new_reg)
+{
+ 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_put (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;
+ 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; i<p->num_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->service->global_res, "mapdb", &info, map_basenames_func);
+
+ for (i = 0; i<p->num_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]);
+}
+
+int zebra_select_database (ZebraHandle zh, const char *basename)
+{
+ return zebra_select_databases (zh, 1, &basename);
+}
+
+int zebra_select_databases (ZebraHandle zh, int num_bases,
+ const char **basenames)
+{
+ int i;
+ const char *cp;
+ size_t len = 0;
+ char *new_reg = 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; i<num_bases; i++)
+ {
+ const char *cp1;
+
+ cp1 = strrchr (basenames[i], '/');
+ if (cp)
+ {
+ if (!cp1)
+ {
+ zh->errCode = 23;
+ return -1;
+ }
+ if (len != cp - 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;
+ }
+ return 0;
+}
+
+void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
+ Z_RPNQuery *query, const char *setname, int *hits)
{
- zebra_register_lock (zh);
- zh->errCode = 0;
- zh->errString = NULL;
zh->hits = 0;
+ *hits = 0;
+
+ if (zebra_begin_read (zh))
+ return;
+ resultSetAddRPN (zh, decode, stream, query,
+ zh->num_basenames, zh->basenames, setname);
- resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname);
+ zebra_end_read (zh);
- zebra_register_unlock (zh);
+ *hits = zh->hits;
}
void zebra_records_retrieve (ZebraHandle zh, ODR stream,
ZebraPosSet poset;
int i, *pos_array;
- zh->errCode = 0;
- zh->errString = NULL;
- pos_array = xmalloc (num_recs * sizeof(*pos_array));
- for (i = 0; i<num_recs; i++)
- pos_array[i] = recs[i].position;
+ if (!zh->res)
+ {
+ zh->errCode = 30;
+ zh->errString = odr_strdup (stream, setname);
+ return;
+ }
- zebra_register_lock (zh);
+ if (zebra_begin_read (zh))
+ return;
+ pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array));
+ for (i = 0; i<num_recs; i++)
+ pos_array[i] = recs[i].position;
poset = zebraPosSetCreate (zh, setname, num_recs, pos_array);
if (!poset)
{
{
for (i = 0; i<num_recs; i++)
{
- if (!poset[i].sysno)
+ if (poset[i].term)
{
- char num_str[20];
-
- sprintf (num_str, "%d", pos_array[i]);
- zh->errCode = 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,
&recs[i].base);
recs[i].errString = NULL;
}
+ else
+ {
+ char num_str[20];
+
+ sprintf (num_str, "%d", pos_array[i]);
+ zh->errCode = 13;
+ zh->errString = odr_strdup (stream, num_str);
+ break;
+ }
}
zebraPosSetDestroy (zh, poset, num_recs);
}
- zebra_register_unlock (zh);
+ zebra_end_read (zh);
xfree (pos_array);
}
void 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)
{
- zh->errCode = 0;
- zh->errString = NULL;
- zebra_register_lock (zh);
+ if (zebra_begin_read (zh))
+ {
+ *entries = 0;
+ *num_entries = 0;
+ return;
+ }
rpn_scan (zh, stream, zapt, attributeset,
- num_bases, basenames, position,
+ zh->num_basenames, zh->basenames, position,
num_entries, entries, is_partial);
- zebra_register_unlock (zh);
+ zebra_end_read (zh);
}
void zebra_sort (ZebraHandle zh, ODR stream,
const char *output_setname, Z_SortKeySpecList *sort_sequence,
int *sort_status)
{
- zh->errCode = 0;
- zh->errString = NULL;
- zebra_register_lock (zh);
+ if (zebra_begin_read (zh))
+ return;
resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
output_setname, sort_sequence, sort_status);
- zebra_register_unlock (zh);
+ zebra_end_read(zh);
+}
+
+int zebra_deleleResultSet(ZebraHandle zh, int function,
+ int num_setnames, char **setnames,
+ int *statuses)
+{
+ int i, status;
+ if (zebra_begin_read(zh))
+ return Z_DeleteStatus_systemProblemAtTarget;
+ switch (function)
+ {
+ case Z_DeleteRequest_list:
+ resultSetDestroy (zh, num_setnames, setnames, statuses);
+ break;
+ case Z_DeleteRequest_all:
+ resultSetDestroy (zh, -1, 0, statuses);
+ break;
+ }
+ zebra_end_read (zh);
+ status = Z_DeleteStatus_success;
+ for (i = 0; i<num_setnames; i++)
+ if (statuses[i] == Z_DeleteStatus_resultSetDidNotExist)
+ status = statuses[i];
+ return status;
}
int zebra_errCode (ZebraHandle zh)
return zh->errString;
}
-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))
+ ZebraService zs = zh->service;
+ if (!zs->passwd_db || !passwd_db_auth (zs->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_admin_import_end (ZebraHandle zh)
+{
+ zebra_end_trans (zh);
+}
+
+void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
+{
+ int sysno;
+ int i;
+ for (i = 0; i<segment->num_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->reg->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,
+ const char *input_str, int input_len,
+ char *output_str, int output_len)
+{
+ WRBUF wrbuf;
+ 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)
+ return -3;
+ if (wrbuf_len(wrbuf))
+ memcpy (output_str, wrbuf_buf(wrbuf), wrbuf_len(wrbuf));
+ output_str[wrbuf_len(wrbuf)] = '\0';
+ return wrbuf_len(wrbuf);
}
-void zebra_setRecordType (ZebraHandle zh, const char *type)
+
+void zebra_set_state (ZebraHandle zh, int val, int seqno)
{
+ char state_fname[256];
+ char *fname;
+ long p = getpid();
+ FILE *f;
+
+ 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_LOG, "%c %d %ld", val, seqno, p);
+ fprintf (f, "%c %d %ld\n", val, seqno, p);
+ fclose (f);
+ xfree (fname);
}
-void zebra_setGroup (ZebraHandle zh, const char *group)
+void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
{
+ char state_fname[256];
+ char *fname;
+ FILE *f;
+ 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;
+
+ if (f)
+ {
+ fscanf (f, "%c %d", val, seqno);
+ fclose (f);
+ }
+ xfree (fname);
}
-void zebra_admin (ZebraHandle zh, const char *command)
+static int zebra_begin_read (ZebraHandle zh)
{
+ int dirty = 0;
+ char val;
+ int seqno;
+ assert (zh->res);
+
+ (zh->trans_no)++;
+
+ if (zh->trans_no != 1)
+ {
+ zebra_flush_reg (zh);
+ return 0;
+ }
+ if (!zh->res)
+ {
+ (zh->trans_no)--;
+ zh->errCode = 109;
+ 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)
+ 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)
+ {
+ zh->errCode = 109;
+ return -1;
+ }
+ zh->reg->last_val = val;
+ zh->reg->seqno = seqno;
+
+ 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;
+
+ assert (zh->res);
+
+ (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->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 (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;
+ }
+ 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);
+
+ zh->reg->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->res, "shadow");
+
+ zebra_flush_reg (zh);
+
+ zebra_register_close (zh->service, zh->reg);
+ zh->reg = 0;
+
+ 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));
+
+#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);
+}
+
+int zebra_commit (ZebraHandle zh)
+{
+ int seqno;
+ char val;
+ const char *rval;
+ BFiles bfs;
+
+ 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 0;
+ }
+
+ zebra_lock_w (zh->lock_normal);
+ zebra_lock_r (zh->lock_shadow);
+
+ bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
+
+ zebra_get_state (zh, &val, &seqno);
+
+ if (rval && *rval)
+ bf_cache (bfs, rval);
+ if (bf_commitExists (bfs))
+ {
+ zebra_set_state (zh, 'c', seqno);
+
+ logf (LOG_LOG, "commit start");
+ sleep (2);
+ bf_commitExec (bfs);
+#ifndef WIN32
+ sync ();
+#endif
+ logf (LOG_LOG, "commit clean");
+ bf_commitClean (bfs, rval);
+ seqno++;
+ zebra_set_state (zh, 'o', seqno);
+ }
+ else
+ {
+ logf (LOG_LOG, "nothing to commit");
+ }
+ bfs_destroy (bfs);
+
+ zebra_unlock (zh->lock_shadow);
+ zebra_unlock (zh->lock_normal);
+ return 0;
+}
+
+int zebra_init (ZebraHandle zh)
+{
+ const char *rval;
+ BFiles bfs = 0;
+
+ 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 (zh, 'o', 0);
+ return 0;
+}
+
+int zebra_compact (ZebraHandle zh)
+{
+ BFiles bfs;
+ 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 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;
+}
+
+void zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
+{
+ memcpy (&zh->rGroup, rg, sizeof(*rg));
+}
+
+void zebra_result (ZebraHandle zh, int *code, char **addinfo)
+{
+ *code = zh->errCode;
+ *addinfo = zh->errString;
+}
+
projects / idzebra-moved-to-github.git / blobdiff