-/* $Id: zebraapi.c,v 1.87 2003-03-04 23:05:30 pop Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zebraapi.c,v 1.101 2003-05-20 13:52:41 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"
zh->basenames = 0;
zh->trans_no = 0;
+ zh->trans_w_no = 0;
zh->lock_normal = 0;
zh->lock_shadow = 0;
assert (res);
- yaz_log (LOG_DEBUG, "zebra_register_open rw = %d useshadow=%d p=%p",
+ yaz_log (LOG_LOG, "zebra_register_open rw = %d useshadow=%d p=%p",
rw, useshadow, reg);
-
+
reg->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
return 0;
zebraRankInstall (reg, rank1_class);
zebraRankInstall (reg, rankzv_class);
+ zebraRankInstall (reg, rankliv_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
{
ASSERTZS;
- yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg);
+ yaz_log(LOG_LOG, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
if (reg->records)
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;
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);
}
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);
}
zh->errCode=0;
if (zebra_select_database(zh, database))
return;
- zebra_begin_trans (zh);
+ zebra_begin_trans (zh, 1);
xfree (zh->admin_databaseName);
zh->admin_databaseName = xstrdup(database);
}
return 0;
}
-void zebra_admin_create (ZebraHandle zh, const char *database)
+void zebra_create_database (ZebraHandle zh, const char *database)
{
ZebraService zs;
ASSERTZH;
if (zebra_select_database (zh, database))
return;
- zebra_begin_trans (zh);
+ zebra_begin_trans (zh, 1);
zs = zh->service;
/* announce database */
int zebra_begin_read (ZebraHandle zh)
{
- int dirty = 0;
- char val;
- int seqno;
- ASSERTZH;
-
- assert (zh->res);
-
- (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)
- 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;
+ return zebra_begin_trans(zh, 0);
}
void zebra_end_read (ZebraHandle zh)
{
- ASSERTZH;
- (zh->trans_no)--;
-
- if (zh->trans_no != 0)
- return;
-#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
-
- zebra_unlock (zh->lock_normal);
- zebra_unlock (zh->lock_shadow);
+ zebra_end_trans(zh);
}
-void zebra_begin_trans (ZebraHandle zh)
+int zebra_begin_trans (ZebraHandle zh, int rw)
{
- int pass;
- int seqno = 0;
- char val = '?';
- const char *rval = 0;
+ if (!zh->res)
+ {
+ zh->errCode = 2;
+ zh->errString = "zebra_begin_trans: no database selected";
+ return -1;
+ }
ASSERTZHRES;
-
assert (zh->res);
-
- (zh->trans_no++);
- if (zh->trans_no != 1)
+ if (rw)
{
- return;
- }
- zh->errCode=0;
-
- yaz_log (LOG_LOG, "zebra_begin_trans");
-
- zh->records_inserted = 0;
- zh->records_updated = 0;
- zh->records_deleted = 0;
- zh->records_processed = 0;
+ 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)
+ zebra_register_close (zh->service, zh->reg);
+
+ zh->trans_w_no = zh->trans_no;
+ zh->errCode=0;
+
+ yaz_log (LOG_LOG, "zebra_begin_trans");
+
+ zh->records_inserted = 0;
+ zh->records_updated = 0;
+ zh->records_deleted = 0;
+ zh->records_processed = 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)
- {
- 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);
- }
+ /* lock */
+ if (zh->shadow_enable)
+ rval = res_get (zh->res, "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')
+ for (pass = 0; pass < 2; pass++)
{
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);
+ 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;
}
- 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;
}
- 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)
+ 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;
}
- 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;
+ return 0;
}
-void zebra_end_trans (ZebraHandle zh) {
- ZebraTransactionStatus dummy;
- zebra_end_transaction(zh, &dummy);
+int zebra_end_trans (ZebraHandle zh)
+{
+ ZebraTransactionStatus dummy;
+ return zebra_end_transaction(zh, &dummy);
}
-void zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
+int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
{
char val;
int seqno;
status->utime = 0;
status->stime = 0;
- 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);
-
- 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 = 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')
+ 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;
+ return 0;
}
void zebra_repository_update (ZebraHandle zh)
repositoryShow (zh);
}
-int zebra_commit (ZebraHandle zh)
+static int zebra_commit_ex (ZebraHandle zh, int clean_only)
{
int seqno;
char val;
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)
+{
+ return zebra_commit_ex(zh, 1);
+}
+
+int zebra_commit (ZebraHandle zh)
+{
+ return zebra_commit_ex(zh, 0);
+}
+
int zebra_init (ZebraHandle zh)
{
const char *rval;
int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
{
int sysno = 0;
- int olderr;
ASSERTZH;
zh->errCode=0;
- zebra_begin_trans (zh);
- if (zh->errCode)
- return 0; /* bad sysno */
+ 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 */);
- olderr=zh->errCode;
- zebra_end_trans (zh);
- if (olderr)
- zh->errCode=olderr;
+ if (zebra_end_trans (zh))
+ return 0;
return sysno;
}
}
const char *zebra_get_resource(ZebraHandle zh,
- const char *name, const char *defaultvalue)
+ const char *name, const char *defaultvalue)
{
ASSERTZH;
zh->errCode=0;
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;
+
+ 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)
+ const char *buf, int buf_size,
+ int force_update)
{
int res;
if (buf_size < 1) buf_size = strlen(buf);
- zebra_begin_trans(zh);
+ zebra_begin_trans(zh, 1);
res=bufferExtractRecord (zh, buf, buf_size, rGroup,
- 0, // delete_flag
- 0, // test_mode,
+ 0, /* delete_flag */
+ 0, /* test_mode */
recordType,
&sysno,
- match, fname);
+ 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)
+ const char *buf, int buf_size,
+ int force_update)
{
int res;
if (buf_size < 1) buf_size = strlen(buf);
- zebra_begin_trans(zh);
+ zebra_begin_trans(zh, 1);
res=bufferExtractRecord (zh, buf, buf_size, rGroup,
- 1, // delete_flag
- 0, // test_mode,
+ 1, /* delete_flag */
+ 0, /* test_mode */
recordType,
&sysno,
- match,fname);
+ match,fname,
+ force_update,
+ 1); /* allow_update */
zebra_end_trans(zh);
return sysno;
}
is not mandatory. (it's repeatable now, also in zebraapi.c)
*/
-void zebra_search_RPN (ZebraHandle zh, ODR decode, ODR stream,
- Z_RPNQuery *query, const char *setname, int *hits)
-{
- zh->hits = 0;
- *hits = 0;
-
- if (zebra_begin_read (zh))
- return;
- resultSetAddRPN (zh, decode, stream, query,
- zh->num_basenames, zh->basenames, setname);
-
- zebra_end_read (zh);
-
- *hits = zh->hits;
-}
-
-int zebra_search_PQF (ZebraHandle zh,
- ODR odr_input, ODR odr_output,
- const char *pqf_query,
+int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
const char *setname)
-
{
- int hits;
- Z_RPNQuery *query;
- query = p_query_rpn (odr_input, PROTO_Z3950, pqf_query);
-
- if (!query) {
- logf (LOG_WARN, "bad query %s\n", pqf_query);
- odr_reset (odr_input);
- return(0);
- }
- zebra_search_RPN (zh, odr_input, odr_output, query, setname, &hits);
+ int hits = 0;
+ Z_RPNQuery *query;
+ ODR odr = odr_createmem(ODR_ENCODE);
+
+ 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);
- odr_reset (odr_input);
- odr_reset (odr_output);
-
- return(hits);
+ return hits;
}
/* ---------------------------------------------------------------------------
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);
- if (!sort_sequence) {
- logf(LOG_WARN,"invalid sort specs '%s'", sort_spec);
- zh->errCode = 207;
+ int num_input_setnames = 0;
+ int sort_status = 0;
+ Z_SortKeySpecList *sort_sequence = yaz_sort_spec (stream, sort_spec);
+ 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++;
+ }
+
+ /* 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;
-
- resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
- output_setname, sort_sequence, &sort_status);
-
- zebra_end_read(zh);
- return (sort_status);
+ 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