-/* $Id: zebraapi.c,v 1.68 2002-08-28 19:52:29 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zebraapi.c,v 1.104 2003-06-17 13:53:27 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
#endif
#include <yaz/diagbib1.h>
+#include <yaz/pquery.h>
+#include <yaz/sortspec.h>
#include "index.h"
#include <charmap.h>
+#include "zebraapi.h"
+
+/* 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 Res zebra_open_res (ZebraHandle zh);
static void zebra_close_res (ZebraHandle zh);
-static void zebra_chdir (ZebraService zh)
+
+static void zebra_chdir (ZebraService zs)
{
- const char *dir = res_get (zh->global_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);
static void zebra_flush_reg (ZebraHandle zh)
{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_flush_reg");
+ zh->errCode=0;
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh);
{
ZebraHandle zh;
const char *default_encoding;
+ ASSERTZS;
+ yaz_log(LOG_API,"zebra_open");
if (!zs)
return 0;
zh->destroyed = 0;
zh->errCode = 0;
zh->errString = 0;
- zh->res = 0;
+ zh->res = 0;
zh->reg_name = xstrdup ("");
zh->path_reg = 0;
zh->basenames = 0;
zh->trans_no = 0;
+ zh->trans_w_no = 0;
zh->lock_normal = 0;
zh->lock_shadow = 0;
{
Res res;
- yaz_log (LOG_LOG, "zebra_start %s", configName);
+ yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName);
- if (!(res = res_open (configName, 0)))
- yaz_log (LOG_WARN, "Cannot read resources `%s'", configName);
- else
+ if ((res = res_open (configName, 0)))
{
ZebraService zh = xmalloc (sizeof(*zh));
int record_compression = REC_COMPRESS_NONE;
char *recordCompression = 0;
+ ASSERTZS;
+
reg = xmalloc (sizeof(*reg));
assert (name);
assert (res);
- yaz_log (LOG_DEBUG, "zebra_register_open rw = %d useshadow=%d p=%p",
- rw, useshadow, reg);
-
+ 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->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
return 0;
}
if (useshadow)
bf_cache (reg->bfs, res_get (res, "shadow"));
- data1_set_tabpath (reg->dh, res_get(res, "profilePath"));
+ data1_set_tabpath (reg->dh, res_get_def(res, "profilePath",
+ DEFAULT_PROFILE_PATH));
data1_set_tabroot (reg->dh, reg_path);
reg->recTypes = recTypes_init (reg->dh);
recTypes_default_handlers (reg->recTypes);
reg->keys.buf_max = 0;
reg->keys.buf = 0;
+ reg->sortKeys.buf = 0;
+ reg->sortKeys.buf_max = 0;
reg->records = 0;
reg->dict = 0;
reg->isamb = 0;
reg->zei = 0;
reg->matchDict = 0;
+ reg->key_file_no = 0;
zebraRankInstall (reg, rank1_class);
+ zebraRankInstall (reg, rankzv_class);
+ zebraRankInstall (reg, rankliv_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
void 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;
zebra_mutex_cond_unlock (&zh->service->session_lock);
void 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);
zebra_mutex_cond_unlock (&zs->session_lock);
}
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
{
- yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg);
+ ASSERTZS;
+ yaz_log(LOG_LOG|LOG_API, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
if (reg->records)
bfs_destroy (reg->bfs);
data1_destroy (reg->dh);
+ xfree (reg->sortKeys.buf);
+ xfree (reg->keys.buf);
+
xfree (reg->key_buf);
xfree (reg->name);
xfree (reg);
- yaz_log(LOG_DEBUG, "zebra_register_close 2");
}
void zebra_stop(ZebraService zs)
{
if (!zs)
- return ;
- yaz_log (LOG_LOG, "zebra_stop");
+ return ;
+ yaz_log (LOG_LOG|LOG_API, "zebra_stop");
- zebra_mutex_cond_lock (&zs->session_lock);
while (zs->sessions)
{
zebra_close (zs->sessions);
}
- zebra_mutex_cond_unlock (&zs->session_lock);
-
zebra_mutex_cond_destroy (&zs->session_lock);
if (zs->passwd_db)
{
ZebraService zs;
struct zebra_session **sp;
+ int i;
+ yaz_log(LOG_API,"zebra_close");
if (!zh)
return;
-
+ ASSERTZH;
+ zh->errCode=0;
+
zs = zh->service;
yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh);
if (!zh)
- return ;
+ return ;
resultSetDestroy (zh, -1, 0, 0);
-
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)
}
sp = &(*sp)->next;
}
-// if (!zs->sessions && zs->stop_flag)
-// zebra_register_deactivate(zs);
zebra_mutex_cond_unlock (&zs->session_lock);
xfree (zh->reg_name);
+ zh->service=0; /* more likely to trigger an assert */
xfree (zh);
}
{
Res res = 0;
char fname[512];
+ ASSERTZH;
+ zh->errCode=0;
+
if (zh->path_reg)
{
sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
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)
return ;
no--;
for (i = 0; i<p->num_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++)
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;
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);
}
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)
{
return 0;
}
-void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
+void zebra_search_RPN (ZebraHandle zh,
Z_RPNQuery *query, const char *setname, int *hits)
{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_search_rpn");
+ zh->errCode=0;
zh->hits = 0;
*hits = 0;
if (zebra_begin_read (zh))
return;
- resultSetAddRPN (zh, decode, stream, query,
+
+ zebra_livcode_transform(zh, query);
+
+ resultSetAddRPN (zh, query,
zh->num_basenames, zh->basenames, setname);
zebra_end_read (zh);
{
ZebraPosSet poset;
int i, *pos_array;
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs);
+ zh->errCode=0;
if (!zh->res)
{
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;
}
rpn_scan (zh, stream, zapt, attributeset,
zh->num_basenames, zh->basenames, position,
- num_entries, entries, is_partial);
+ num_entries, entries, is_partial, 0, 0);
zebra_end_read (zh);
}
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;
resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
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)
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_auth (ZebraHandle zh, const char *user, const char *pass)
{
- ZebraService zs = zh->service;
+ ZebraService zs;
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_auth u=%s p=%s",user,pass);
+ zh->errCode=0;
+ zs= zh->service;
if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass))
{
logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS");
return 1;
}
-void zebra_admin_import_begin (ZebraHandle zh, const char *database)
+void zebra_admin_import_begin (ZebraHandle zh, const char *database,
+ const char *record_type)
{
- zebra_begin_trans (zh);
+ 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;
+ zebra_begin_trans (zh, 1);
xfree (zh->admin_databaseName);
zh->admin_databaseName = xstrdup(database);
}
void zebra_admin_import_end (ZebraHandle zh)
{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_admin_import_end");
+ zh->errCode=0;
zebra_end_trans (zh);
}
{
int sysno;
int i;
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_admin_import_segment");
+ zh->errCode=0;
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
}
}
-void zebra_admin_create (ZebraHandle zh, const char *database)
+int zebra_admin_exchange_record (ZebraHandle zh,
+ const char *database,
+ const char *rec_buf,
+ size_t rec_len,
+ const char *recid_buf, size_t recid_len,
+ int action)
+{
+ int sysno = 0;
+ char *rinfo = 0;
+ char recid_z[256];
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_admin_exchange_record db=%s ac=%d",
+ database, 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;
+
+ rinfo = dict_lookup (zh->reg->matchDict, recid_z);
+ if (rinfo)
+ {
+ if (action == 1) /* fail if insert */
+ return -1;
+ memcpy (&sysno, rinfo+1, sizeof(sysno));
+ }
+ else
+ {
+ if (action == 2 || action == 3) /* fail if delete or update */
+ return -1;
+ }
+ extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database,
+ action == 3 ? 1 : 0 /* delete flag */,
+ 0, &sysno, 1, 1, 0);
+ if (action == 1)
+ {
+ dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
+ }
+ else if (action == 3)
+ {
+ dict_delete (zh->reg->matchDict, recid_z);
+ }
+ return 0;
+}
+
+void zebra_create_database (ZebraHandle zh, const char *database)
{
ZebraService zs;
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_admin_create");
+ zh->errCode=0;
- zebra_begin_trans (zh);
+ if (zebra_select_database (zh, database))
+ return;
+ if (zebra_begin_trans (zh, 1))
+ return;
zs = zh->service;
/* announce database */
/* explainDatabase */))
{
zh->errCode = 224;
- zh->errString = "Database already exist";
+ zh->errString = "database already exist";
}
zebra_end_trans (zh);
}
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, "",
char *fname;
long p = getpid();
FILE *f;
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_set_state v=%d seq=%s", 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_LOG, "%c %d %ld", val, seqno, p);
+ yaz_log (LOG_DEBUG, "%c %d %ld", val, seqno, p);
fprintf (f, "%c %d %ld\n", val, seqno, p);
fclose (f);
xfree (fname);
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");
int zebra_begin_read (ZebraHandle zh)
{
- int dirty = 0;
- char val;
- int seqno;
-
- assert (zh->res);
+ return zebra_begin_trans(zh, 0);
+}
- (zh->trans_no)++;
+void zebra_end_read (ZebraHandle zh)
+{
+ zebra_end_trans(zh);
+}
- if (zh->trans_no != 1)
- {
- zebra_flush_reg (zh);
- return 0;
- }
-#if HAVE_SYS_TIMES_H
- times (&zh->tms1);
-#endif
+int zebra_begin_trans (ZebraHandle zh, int rw)
+{
+ yaz_log(LOG_LOG, "zebra_begin_trans rw=%d trans=%d", rw, zh->trans_no);
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)
- 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;
+ zh->errString = "zebra_begin_trans: no database selected";
return -1;
}
- zh->reg->last_val = val;
- zh->reg->seqno = seqno;
-
- return 0;
-}
-
-void zebra_end_read (ZebraHandle zh)
-{
- (zh->trans_no)--;
-
- if (zh->trans_no != 0)
- return;
+ ASSERTZHRES;
+ yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw);
+ assert (zh->res);
+ if (rw)
+ {
+ int pass;
+ int seqno = 0;
+ char val = '?';
+ const char *rval = 0;
+
+ (zh->trans_no++);
+ if (zh->trans_w_no)
+ return 0;
+ if (zh->trans_no != 1)
+ {
+ zh->errCode = 2;
+ zh->errString = "zebra_begin_trans: write trans not allowed within read trans";
+ return -1;
+ }
+ 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->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));
-
+ times (&zh->tms1);
#endif
+ /* lock */
+ if (zh->shadow_enable)
+ 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 -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);
- 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 = 0;
-
- assert (zh->res);
+ zh->trans_no--;
+ zh->trans_w_no = 0;
- (zh->trans_no++);
- if (zh->trans_no != 1)
- {
- return;
+ zh->errCode = 2;
+ zh->errString = "zebra_begin_trans: cannot open register";
+ yaz_log(LOG_FATAL, zh->errString);
+ return -1;
+ }
}
-
- yaz_log (LOG_LOG, "zebra_begin_trans");
-
- zh->records_inserted = 0;
- zh->records_updated = 0;
- zh->records_deleted = 0;
- zh->records_processed = 0;
-
+ else
+ {
+ 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);
+ times (&zh->tms1);
#endif
-
- /* lock */
- if (zh->shadow_enable)
- rval = res_get (zh->res, "shadow");
-
- for (pass = 0; pass < 2; pass++)
- {
- if (rval)
+ if (!zh->res)
{
- zebra_lock_r (zh->lock_normal);
- zebra_lock_w (zh->lock_shadow);
+ (zh->trans_no)--;
+ zh->errCode = 109;
+ return -1;
}
- else
+ if (!zh->lock_normal || !zh->lock_shadow)
{
- zebra_lock_w (zh->lock_normal);
- zebra_lock_w (zh->lock_shadow);
+ (zh->trans_no)--;
+ zh->errCode = 2;
+ return -1;
}
-
zebra_get_state (zh, &val, &seqno);
- if (val == 'c')
+ if (val == 'd')
+ val = 'o';
+
+ if (!zh->reg)
+ dirty = 1;
+ else if (seqno != zh->reg->seqno)
{
- yaz_log (LOG_LOG, "previous transaction didn't finish commit");
- zebra_unlock (zh->lock_shadow);
- zebra_unlock (zh->lock_normal);
- zebra_commit (zh);
- continue;
+ yaz_log (LOG_LOG, "reopen seqno cur/old %d/%d",
+ seqno, zh->reg->seqno);
+ dirty = 1;
}
- else if (val == 'd')
+ else if (zh->reg->last_val != val)
{
- 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");
- }
+ yaz_log (LOG_LOG, "reopen last cur/old %d/%d",
+ val, zh->reg->last_val);
+ dirty = 1;
}
- break;
- }
- if (pass == 2)
- {
- yaz_log (LOG_FATAL, "zebra_begin_trans couldn't finish commit");
- abort();
- return;
+ 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)
+ {
+ 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 (zh, 'd', seqno);
-
- zh->reg = zebra_register_open (zh->service, zh->reg_name,
- 1, rval ? 1 : 0, zh->res,
- zh->path_reg);
+ return 0;
+}
- zh->reg->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->res, "shadow");
-
- zebraExplain_runNumberIncrement (zh->reg->zei, 1);
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_end_transaction");
- zebra_flush_reg (zh);
-
- zebra_register_close (zh->service, zh->reg);
- zh->reg = 0;
-
-
- yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d",
- zh->records_processed, zh->records_inserted,
- zh->records_updated, zh->records_deleted);
+ status->processed = 0;
+ status->inserted = 0;
+ status->updated = 0;
+ status->deleted = 0;
+ status->utime = 0;
+ status->stime = 0;
- zebra_get_state (zh, &val, &seqno);
- if (val != 'd')
+ if (!zh->res || !zh->reg)
{
- 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);
+ zh->errCode = 2;
+ zh->errString = "zebra_end_trans: no open transaction";
+ return -1;
}
- if (!rval)
- seqno++;
- zebra_set_state (zh, '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: %7d i/u/d %d/%d/%d",
+ 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)
{
- zebra_begin_trans (zh);
- logf (LOG_LOG, "updating %s", zh->rGroup.path);
+ ASSERTZH;
+ zh->errCode=0;
+ logf (LOG_LOG|LOG_API, "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);
+ ASSERTZH;
+ zh->errCode=0;
+ logf (LOG_LOG|LOG_API, "deleting %s", zh->rGroup.path);
repositoryDelete (zh);
}
void zebra_repository_show (ZebraHandle zh)
{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_repository_show");
+ zh->errCode=0;
repositoryShow (zh);
}
-int zebra_commit (ZebraHandle zh)
+static int zebra_commit_ex (ZebraHandle zh, int clean_only)
{
int seqno;
char val;
const char *rval;
BFiles bfs;
+ ASSERTZH;
+ zh->errCode=0;
if (!zh->res)
{
bf_cache (bfs, rval);
if (bf_commitExists (bfs))
{
- zebra_set_state (zh, '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++;
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);
+}
+
int zebra_init (ZebraHandle zh)
{
const char *rval;
BFiles bfs = 0;
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_init");
+ zh->errCode=0;
if (!zh->res)
{
int zebra_compact (ZebraHandle zh)
{
BFiles bfs;
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_compact");
+ zh->errCode=0;
if (!zh->res)
{
zh->errCode = 109;
int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
{
int sysno = 0;
- zebra_begin_trans (zh);
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_record_insert");
+ zh->errCode=0;
+ if (zebra_begin_trans (zh, 1))
+ return 0;
extract_rec_in_mem (zh, "grs.sgml",
buf, len,
"Default", /* database */
1 /* store_keys */,
1 /* store_data */,
0 /* match criteria */);
- zebra_end_trans (zh);
+ if (zebra_end_trans (zh))
+ return 0;
return sysno;
}
void zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_set_group");
+ zh->errCode=0;
memcpy (&zh->rGroup, rg, sizeof(*rg));
}
void zebra_result (ZebraHandle zh, int *code, char **addinfo)
{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_result");
*code = zh->errCode;
*addinfo = zh->errString;
}
void zebra_shadow_enable (ZebraHandle zh, int value)
{
+ ASSERTZH;
+ yaz_log(LOG_API,"zebra_shadow_enable");
+ zh->errCode=0;
zh->shadow_enable = value;
}
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!
+ */
+
+ 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;
}
+
+void 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_put(zh->res, name, value);
+}
+
+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 */
+
+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);
+}
+
+void zebra_set_shadow_enable (ZebraHandle zh, int value) {
+ yaz_log(LOG_API,"zebra_set_shadow_enable %d",value);
+ zh->shadow_enable = value;
+}
+
+void init_recordGroup (struct recordGroup *rg) {
+ assert(rg);
+ yaz_log(LOG_API,"init_recordGroup");
+ rg->groupName = NULL;
+ rg->databaseName = NULL;
+ rg->path = NULL;
+ rg->recordId = NULL;
+ rg->recordType = NULL;
+ rg->flagStoreData = -1;
+ rg->flagStoreKeys = -1;
+ rg->flagRw = 1;
+ rg->databaseNamePath = 0;
+ rg->explainDatabase = 0;
+ rg->fileVerboseLimit = 100000;
+ rg->followLinks = -1;
+}
+
+
+/* This is from extract.c... it seems useful, when extract_rec_in mem is
+ called... and in general... Should be moved to somewhere else */
+void res_get_recordGroup (ZebraHandle zh,
+ struct recordGroup *rGroup,
+ const char *ext) {
+ char gprefix[128];
+ char ext_res[128];
+
+ yaz_log(LOG_API,"res_get_recordGroup e=%s",ext);
+ if (!rGroup->groupName || !*rGroup->groupName)
+ *gprefix = '\0';
+ else
+ sprintf (gprefix, "%s.", rGroup->groupName);
+
+ /* determine file type - depending on extension */
+ if (!rGroup->recordType) {
+ sprintf (ext_res, "%srecordType.%s", gprefix, ext);
+ if (!(rGroup->recordType = res_get (zh->res, ext_res))) {
+ sprintf (ext_res, "%srecordType", gprefix);
+ rGroup->recordType = res_get (zh->res, ext_res);
+ }
+ }
+ /* determine match criteria */
+ if (!rGroup->recordId) {
+ sprintf (ext_res, "%srecordId.%s", gprefix, ext);
+ if (!(rGroup->recordId = res_get (zh->res, ext_res))) {
+ sprintf (ext_res, "%srecordId", gprefix);
+ rGroup->recordId = res_get (zh->res, ext_res);
+ }
+ }
+
+ /* determine database name */
+ if (!rGroup->databaseName) {
+ sprintf (ext_res, "%sdatabase.%s", gprefix, ext);
+ if (!(rGroup->databaseName = res_get (zh->res, ext_res))) {
+ sprintf (ext_res, "%sdatabase", gprefix);
+ rGroup->databaseName = res_get (zh->res, ext_res);
+ }
+ }
+ if (!rGroup->databaseName)
+ rGroup->databaseName = "Default";
+
+ /* determine if explain database */
+ sprintf (ext_res, "%sexplainDatabase", gprefix);
+ rGroup->explainDatabase =
+ atoi (res_get_def (zh->res, ext_res, "0"));
+
+ /* storeData */
+ if (rGroup->flagStoreData == -1) {
+ const char *sval;
+ sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
+ if (!(sval = res_get (zh->res, ext_res))) {
+ sprintf (ext_res, "%sstoreData", gprefix);
+ sval = res_get (zh->res, ext_res);
+ }
+ if (sval)
+ rGroup->flagStoreData = atoi (sval);
+ }
+ if (rGroup->flagStoreData == -1) rGroup->flagStoreData = 0;
+
+ /* storeKeys */
+ if (rGroup->flagStoreKeys == -1) {
+ const char *sval;
+
+ sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
+ sval = res_get (zh->res, ext_res);
+ if (!sval) {
+ sprintf (ext_res, "%sstoreKeys", gprefix);
+ sval = res_get (zh->res, ext_res);
+ }
+ if (!sval) sval = res_get (zh->res, "storeKeys");
+ if (sval) rGroup->flagStoreKeys = atoi (sval);
+ }
+ if (rGroup->flagStoreKeys == -1) rGroup->flagStoreKeys = 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; i<num_recs; i++)
+ pos_array[i] = recs[i].position;
+ poset = zebraPosSetCreate (zh, setname, num_recs, pos_array);
+ if (!poset)
+ {
+ logf (LOG_DEBUG, "zebraPosSetCreate error");
+ zh->errCode = 30;
+ zh->errString = nmem_strdup (stream->mem, setname);
+ }
+ else
+ {
+ for (i = 0; i<num_recs; i++)
+ {
+ if (poset[i].term)
+ {
+ 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;
+ recs[i].sysno = 0;
+
+ }
+ else if (poset[i].sysno)
+ {
+ /* changed here ??? CHECK ??? */
+ char *b;
+ recs[i].errCode =
+ zebra_record_fetch (zh, poset[i].sysno, poset[i].score,
+ stream, input_format, comp,
+ &recs[i].format,
+ &b,
+ &recs[i].len,
+ &recs[i].base);
+ recs[i].buf = (char *) odr_malloc(stream,recs[i].len);
+ memcpy(recs[i].buf, b, recs[i].len);
+ recs[i].errString = 0; /* Hmmm !!! we should get this */
+ recs[i].sysno = poset[i].sysno;
+ recs[i].score = poset[i].score;
+ }
+ 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_end_read (zh);
+ xfree (pos_array);
+}
+
+
+/* ---------------------------------------------------------------------------
+ Record insert(=update), delete
+
+ If sysno is provided, then it's used to identify the reocord.
+ If not, and match_criteria is provided, then sysno is guessed
+ If not, and a record is provided, then sysno is got from there
+*/
+
+int zebra_insert_record (ZebraHandle zh,
+ struct recordGroup *rGroup,
+ const char *recordType,
+ int sysno, const char *match, const char *fname,
+ const char *buf, int buf_size,
+ int force_update) /* This one is ignored */
+
+{
+ int res;
+ yaz_log(LOG_API,"zebra_insert_record sysno=%d",sysno);
+
+ if (buf_size < 1) buf_size = strlen(buf);
+
+ zebra_begin_trans(zh, 1);
+ res=bufferExtractRecord (zh, buf, buf_size, rGroup,
+ 0, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ &sysno,
+ match, fname,
+ force_update,
+ 0); /* allow_update */
+ zebra_end_trans(zh);
+ if (res < 0) return (res);
+ return sysno;
+}
+
+int zebra_update_record (ZebraHandle zh,
+ struct recordGroup *rGroup,
+ const char *recordType,
+ int 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=%d",sysno);
+
+ if (buf_size < 1) buf_size = strlen(buf);
+
+ zebra_begin_trans(zh, 1);
+ res=bufferExtractRecord (zh, buf, buf_size, rGroup,
+ 0, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ &sysno,
+ match, fname,
+ force_update,
+ 1); /* allow_update */
+ zebra_end_trans(zh);
+ return sysno;
+}
+
+
+
+int zebra_delete_record (ZebraHandle zh,
+ struct recordGroup *rGroup,
+ const char *recordType,
+ int 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=%d",sysno);
+
+ if (buf_size < 1) buf_size = strlen(buf);
+
+ zebra_begin_trans(zh, 1);
+ res=bufferExtractRecord (zh, buf, buf_size, rGroup,
+ 1, /* delete_flag */
+ 0, /* test_mode */
+ recordType,
+ &sysno,
+ match,fname,
+ force_update,
+ 1); /* allow_update */
+ zebra_end_trans(zh);
+ return sysno;
+}
+
+/* ---------------------------------------------------------------------------
+ Searching
+*/
+
+int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
+ const char *setname)
+{
+ int hits = 0;
+ 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
+ zebra_search_RPN (zh, query, setname, &hits);
+
+ odr_destroy(odr);
+
+ return hits;
+}
+
+/* ---------------------------------------------------------------------------
+ Sort - a simplified interface, with optional read locks.
+ FIXME - This is a horrible name, will conflict with half the applications
+*/
+int sort (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);
+}
projects / idzebra-moved-to-github.git / blobdiff