-/* $Id: zebraapi.c,v 1.96 2003-03-26 16:41:48 adam Exp $
+/* $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
#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);
{
const char *dir ;
ASSERTZS;
+ yaz_log(LOG_API,"zebra_chdir");
dir = res_get (zs->global_res, "chdir");
if (!dir)
return;
static void zebra_flush_reg (ZebraHandle zh)
{
ASSERTZH;
+ yaz_log(LOG_API,"zebra_flush_reg");
zh->errCode=0;
zebraExplain_flush (zh->reg->zei, zh);
ZebraHandle zh;
const char *default_encoding;
ASSERTZS;
+ yaz_log(LOG_API,"zebra_open");
if (!zs)
return 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)))
{
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;
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);
{
ZebraService zs;
ASSERTZH;
+ yaz_log(LOG_API,"zebra_admin_start");
zh->errCode=0;
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
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|LOG_API, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
if (reg->records)
{
if (!zs)
return ;
- yaz_log (LOG_LOG, "zebra_stop");
+ yaz_log (LOG_LOG|LOG_API, "zebra_stop");
while (zs->sessions)
{
struct zebra_session **sp;
int i;
+ yaz_log(LOG_API,"zebra_close");
if (!zh)
return;
ASSERTZH;
struct map_baseinfo *p = &info;
int i;
ASSERTZH;
+ yaz_log(LOG_API,"map_basenames ");
zh->errCode=0;
info.zh = zh;
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 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;
zebra_livcode_transform(zh, query);
- resultSetAddRPN (zh, decode, stream, 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 *is_partial)
{
ASSERTZH;
+ yaz_log(LOG_API,"zebra_scan");
zh->errCode=0;
if (zebra_begin_read (zh))
{
int *sort_status)
{
ASSERTZH;
+ yaz_log(LOG_API,"zebra_sort");
zh->errCode=0;
if (zebra_begin_read (zh))
return;
{
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;
int zebra_errCode (ZebraHandle zh)
{
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)
{
+ const char *e="";
if (zh)
- return diagbib1_str (zh->errCode);
- return "";
+ e= diagbib1_str (zh->errCode);
+ yaz_log(LOG_API,"zebra_errString: %s",e);
+ return e;
}
char *zebra_errAdd (ZebraHandle zh)
{
+ char *a="";
if (zh)
- return zh->errString;
- return "";
+ 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;
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))
const char *record_type)
{
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;
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++)
{
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 0;
}
-void zebra_admin_create (ZebraHandle zh, const char *database)
+void zebra_create_database (ZebraHandle zh, const char *database)
{
ZebraService zs;
ASSERTZH;
+ yaz_log(LOG_API,"zebra_admin_create");
zh->errCode=0;
if (zebra_select_database (zh, database))
return;
- zebra_begin_trans (zh, 1);
+ if (zebra_begin_trans (zh, 1))
+ return;
zs = zh->service;
/* announce database */
{
WRBUF wrbuf;
ASSERTZH;
+ yaz_log(LOG_API,"zebra_string_norm ");
zh->errCode=0;
if (!zh->reg->zebra_maps)
return -1;
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);
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);
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->errCode = 2;
+ zh->errString = "zebra_begin_trans: no database selected";
+ return -1;
+ }
ASSERTZHRES;
+ yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw);
assert (zh->res);
if (rw)
{
if (zh->trans_no != 1)
{
zh->errCode = 2;
- zh->errString = "write trans not allowed within read trans";
+ 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;
- yaz_log (LOG_LOG, "zebra_begin_trans");
-
zh->records_inserted = 0;
zh->records_updated = 0;
zh->records_deleted = 0;
zh->reg = zebra_register_open (zh->service, zh->reg_name,
1, rval ? 1 : 0, zh->res,
zh->path_reg);
-
- zh->reg->seqno = seqno;
+ 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;
+ }
}
else
{
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;
}
return 0;
}
-void zebra_end_trans (ZebraHandle zh) {
- ZebraTransactionStatus dummy;
- zebra_end_transaction(zh, &dummy);
+int zebra_end_trans (ZebraHandle zh)
+{
+ ZebraTransactionStatus dummy;
+ yaz_log(LOG_API,"zebra_end_trans");
+ 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;
const char *rval;
ASSERTZH;
+ yaz_log(LOG_API,"zebra_end_transaction");
status->processed = 0;
status->inserted = 0;
status->utime = 0;
status->stime = 0;
+ if (!zh->res || !zh->reg)
+ {
+ zh->errCode = 2;
+ zh->errString = "zebra_end_trans: no open transaction";
+ return -1;
+ }
if (zh->trans_no != zh->trans_w_no)
{
zh->trans_no--;
if (zh->trans_no != 0)
- return;
+ return 0;
/* release read lock */
zebra_flush_reg (zh);
+ resultSetInvalidate (zh);
+
zebra_register_close (zh->service, zh->reg);
zh->reg = 0;
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)
{
ASSERTZH;
zh->errCode=0;
- logf (LOG_LOG, "updating %s", zh->rGroup.path);
+ logf (LOG_LOG|LOG_API, "updating %s", zh->rGroup.path);
repositoryUpdate (zh);
}
{
ASSERTZH;
zh->errCode=0;
- logf (LOG_LOG, "deleting %s", zh->rGroup.path);
+ 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_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);
}
const char *rval;
BFiles bfs = 0;
ASSERTZH;
+ yaz_log(LOG_API,"zebra_init");
zh->errCode=0;
if (!zh->res)
{
BFiles bfs;
ASSERTZH;
+ yaz_log(LOG_API,"zebra_compact");
zh->errCode=0;
if (!zh->res)
{
int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
{
int sysno = 0;
- int olderr;
ASSERTZH;
+ yaz_log(LOG_API,"zebra_record_insert");
zh->errCode=0;
- zebra_begin_trans (zh, 1);
- 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;
}
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);
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;
- return res_get_def( zh->res, name, (char *)defaultvalue);
+ 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) {
- return (zh->shadow_enable);
+ yaz_log(LOG_API,"zebra_get_shadow_enable");
+ return (zh->shadow_enable);
}
void zebra_set_shadow_enable (ZebraHandle zh, int value) {
- zh->shadow_enable = 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;
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
{
ZebraPosSet poset;
int i, *pos_array;
+ yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs);
if (!zh->res)
{
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 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,
+ 0, /* delete_flag */
+ 0, /* test_mode */
recordType,
&sysno,
match, fname,
force_update,
- 0); // allow_update
+ 0); /* allow_update */
zebra_end_trans(zh);
if (res < 0) return (res);
return sysno;
{
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,
+ 0, /* delete_flag */
+ 0, /* test_mode */
recordType,
&sysno,
match, fname,
force_update,
- 1); // allow_update
+ 1); /* allow_update */
zebra_end_trans(zh);
return sysno;
}
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,
+ 1, /* delete_flag */
+ 0, /* test_mode */
recordType,
&sysno,
match,fname,
force_update,
- 1); // allow_update
+ 1); /* allow_update */
zebra_end_trans(zh);
return sysno;
}
/* ---------------------------------------------------------------------------
Searching
-
- zebra_search_RPN is the same as zebra_search_rpn, except that read locking
- 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;
+ int hits = 0;
Z_RPNQuery *query;
- query = p_query_rpn (odr_input, PROTO_Z3950, pqf_query);
+ ODR odr = odr_createmem(ODR_ENCODE);
+ yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, 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);
+ query = p_query_rpn (odr, PROTO_Z3950, pqf_query);
- odr_reset (odr_input);
- odr_reset (odr_output);
+ if (!query)
+ yaz_log (LOG_WARN, "bad query %s\n", pqf_query);
+ else
+ zebra_search_RPN (zh, query, setname, &hits);
- return(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,
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;
projects / idzebra-moved-to-github.git / blobdiff