-/* $Id: zebraapi.c,v 1.161 2005-04-15 10:47:48 adam Exp $
+/* $Id: zebraapi.c,v 1.169 2005-05-17 08:50:49 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
{
ASSERTZH;
yaz_log(log_level, "zebra_flush_reg");
- zh->errCode = 0;
+ zebra_clearError(zh);
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh, 1 /* final */);
zebra_mutex_cond_unlock (&zs->session_lock);
+ zh->store_data_buf = 0;
+
+ zh->m_limit = zebra_limit_create(1, 0);
+
+ zh->nmem_error = nmem_create();
+
return zh;
}
reg->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
+ {
+ xfree(reg);
return 0;
+ }
reg->bfs = bfs_create (res_get (res, "register"), reg_path);
if (!reg->bfs)
{
data1_destroy(reg->dh);
+ xfree(reg);
return 0;
}
if (useshadow)
- bf_cache (reg->bfs, res_get (res, "shadow"));
+ {
+ if (bf_cache (reg->bfs, res_get (res, "shadow")) == ZEBRA_FAIL)
+ {
+ bfs_destroy(reg->bfs);
+ data1_destroy(reg->dh);
+ xfree(reg);
+ return 0;
+ }
+ }
getcwd(cwd, sizeof(cwd)-1);
profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH);
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_shutdown");
- zh->errCode = 0;
+ zebra_clearError(zh);
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
ZebraService zs;
ASSERTZH;
yaz_log(log_level, "zebra_admin_start");
- zh->errCode = 0;
+ zebra_clearError(zh);
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
zebra_mutex_cond_unlock (&zs->session_lock);
xfree(zh->reg_name);
xfree(zh->user_perm);
zh->service = 0; /* more likely to trigger an assert */
+
+ zebra_limit_destroy(zh->m_limit);
+
+ nmem_destroy(zh->nmem_error);
+
xfree(zh->path_reg);
xfree(zh);
return ZEBRA_OK;
zh->lock_shadow =
zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+ if (!zh->lock_normal || !zh->lock_shadow)
+ {
+ 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;
+ }
+ zebra_close_res(zh);
+ }
}
}
const char *group = res_get(zh->service->global_res, "group");
const char *v = res_get_prefix(zh->service->global_res,
"database", group, "Default");
- zebra_select_database(zh, v);
+ return zebra_select_database(zh, v);
}
return 0;
}
yaz_log(log_level, "map_basenames ");
assert(stream);
- zh->errCode = 0;
-
info.zh = zh;
info.num_bases = *num_bases;
ASSERTZH;
yaz_log(log_level, "zebra_select_database %s",basename);
assert(basename);
- zh->errCode = 0;
return zebra_select_databases (zh, 1, &basename);
}
if (num_bases < 1)
{
- zh->errCode = 23;
+ zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
return ZEBRA_FAIL;
}
for (i = 0; i < zh->num_basenames; i++)
{
if (!cp1)
{
- zh->errCode = 23;
+ zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
return -1;
}
if (len != cp1 - basenames[i] ||
memcmp (basenames[i], new_reg, len))
{
- zh->errCode = 23;
+ zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
return -1;
}
}
{
if (cp1)
{
- zh->errCode = 23;
+ zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
return ZEBRA_FAIL;
}
}
xfree(new_reg);
if (!zh->res)
{
- zh->errCode = 109;
+ zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
return ZEBRA_FAIL;
}
if (!zh->lock_normal || !zh->lock_shadow)
{
- zh->errCode = 2;
+ zh->errCode = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
return ZEBRA_FAIL;
}
return ZEBRA_OK;
}
-ZEBRA_RES zebra_search_RPN (ZebraHandle zh, ODR o, Z_RPNQuery *query,
- const char *setname, zint *hits)
+ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
+ const char *setname, zint *hits)
{
ZEBRA_RES r;
ASSERTZH;
assert(hits);
assert(setname);
yaz_log(log_level, "zebra_search_rpn");
- zh->errCode = 0;
+ zebra_clearError(zh);
zh->hits = 0;
*hits = 0;
return r;
}
-ZEBRA_RES zebra_records_retrieve (ZebraHandle zh, ODR stream,
- const char *setname,
- Z_RecordComposition *comp,
- oid_value input_format, int num_recs,
- ZebraRetrievalRecord *recs)
+ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
+ const char *setname,
+ Z_RecordComposition *comp,
+ oid_value input_format, int num_recs,
+ ZebraRetrievalRecord *recs)
{
ZebraMetaRecord *poset;
int i;
assert(num_recs>0);
yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs);
- zh->errCode = 0;
+ zebra_clearError(zh);
if (!zh->res)
{
- zh->errCode = 30;
- zh->errString = odr_strdup(stream, setname);
+ zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+ setname);
return ZEBRA_FAIL;
}
- zh->errCode = 0;
-
if (zebra_begin_read (zh) == ZEBRA_FAIL)
return ZEBRA_FAIL;
if (!poset)
{
yaz_log (YLOG_DEBUG, "zebraPosSetCreate error");
- zh->errCode = 30;
- zh->errString = nmem_strdup (stream->mem, setname);
+ zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+ setname);
ret = ZEBRA_FAIL;
}
else
}
else
{
- char num_str[20];
-
- sprintf (num_str, ZINT_FORMAT, pos_array[i]);
- zh->errCode = 13;
- zh->errString = odr_strdup (stream, num_str);
+ if (ret == ZEBRA_OK) /* only need to set it once */
+ zebra_setError_zint(zh,
+ YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE,
+ pos_array[i]);
ret = ZEBRA_FAIL;
break;
}
YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
Z_AttributesPlusTerm *zapt;
int *attributeSet;
+ ZEBRA_RES res;
if (!(zapt = yaz_pqf_scan(pqf_parser, stream, &attributeSet, query)))
{
- yaz_pqf_destroy (pqf_parser);
- return ZEBRA_FAIL;
+ res = ZEBRA_FAIL;
+ zh->errCode = YAZ_BIB1_SCAN_MALFORMED_SCAN;
}
+ else
+ res = zebra_scan(zh, stream, zapt, VAL_BIB1,
+ position, num_entries, entries, is_partial);
yaz_pqf_destroy (pqf_parser);
- return zebra_scan(zh, stream, zapt, VAL_BIB1,
- position, num_entries, entries, is_partial);
+ return res;
}
ZEBRA_RES zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
assert(is_partial);
assert(entries);
yaz_log(log_level, "zebra_scan");
- zh->errCode = 0;
+ zebra_clearError(zh);
if (zebra_begin_read (zh) == ZEBRA_FAIL)
{
*entries = 0;
Z_SortKeySpecList *sort_sequence,
int *sort_status)
{
+ ZEBRA_RES res;
ASSERTZH;
assert(stream);
assert(num_input_setnames>0);
assert(sort_sequence);
assert(sort_status);
yaz_log(log_level, "zebra_sort");
- zh->errCode = 0;
- if (zebra_begin_read (zh) == ZEBRA_FAIL)
+ zebra_clearError(zh);
+ if (zebra_begin_read(zh) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
- output_setname, sort_sequence, sort_status);
- return zebra_end_read(zh);
+ res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames,
+ output_setname, sort_sequence, sort_status);
+ zebra_end_read(zh);
+ return res;
}
int zebra_deleteResultSet(ZebraHandle zh, int function,
ASSERTZH;
assert(statuses);
yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
- zh->errCode = 0;
+ zebra_clearError(zh);;
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
const char *zebra_errString (ZebraHandle zh)
{
- const char *e="";
+ const char *e = 0;
if (zh)
e= diagbib1_str (zh->errCode);
yaz_log(log_level, "zebra_errString: %s",e);
char *zebra_errAdd (ZebraHandle zh)
{
- char *a="";
+ char *a = 0;
if (zh)
a= zh->errString;
yaz_log(log_level, "zebra_errAdd: %s",a);
ZebraService zs;
ASSERTZH;
- zh->errCode = 0;
+ zebra_clearError(zh);
zs= zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s",
database, record_type);
- zh->errCode = 0;
+ zebra_clearError(zh);
if (zebra_select_database(zh, database) == ZEBRA_FAIL)
return ZEBRA_FAIL;
return zebra_begin_trans(zh, 1);
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_end");
- zh->errCode = 0;
+ zebra_clearError(zh);
return zebra_end_trans(zh);
}
int i;
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_segment");
- zh->errCode = 0;
+ zebra_clearError(zh);
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
assert(rec_buf);
yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
- zh->errCode = 0;
+ zebra_clearError(zh);
if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
return ZEBRA_FAIL;
ZEBRA_RES ret = ZEBRA_OK;
ASSERTZH;
yaz_log(log_level, "zebra_drop_database");
- zh->errCode = 0;
+ zebra_clearError(zh);
if (zebra_select_database (zh, database) == ZEBRA_FAIL)
return ZEBRA_FAIL;
ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", database);
assert(database);
- zh->errCode = 0;
+ zebra_clearError(zh);
if (zebra_select_database (zh, database) == ZEBRA_FAIL)
return ZEBRA_FAIL;
/* explainDatabase */))
{
zebra_end_trans (zh);
- zh->errCode = 224;
- zh->errString = "database already exist";
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, database);
return ZEBRA_FAIL;
}
return zebra_end_trans (zh);
assert(input_str);
assert(output_str);
yaz_log(log_level, "zebra_string_norm ");
- zh->errCode = 0;
+ zebra_clearError(zh);
if (!zh->reg->zebra_maps)
return -1;
wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
FILE *f;
ASSERTZH;
yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
- zh->errCode = 0;
+ zebra_clearError(zh);
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
ASSERTZH;
yaz_log(log_level, "zebra_get_state ");
- zh->errCode = 0;
+ zebra_clearError(zh);
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
f = fopen (fname, "r");
zebra_select_default_database(zh);
if (!zh->res)
{
- zh->errCode = 2;
- zh->errString = "zebra_begin_trans: no database selected";
+ zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+ "zebra_begin_trans: no database selected");
return ZEBRA_FAIL;
}
ASSERTZHRES;
{
if (rw && !strchr(zh->user_perm, 'w'))
{
- zh->errCode = 223;
- zh->errString = 0;
+ zebra_setError(
+ zh,
+ YAZ_BIB1_ES_PERMISSION_DENIED_ON_ES_CANNOT_MODIFY_OR_DELETE,
+ 0);
return ZEBRA_FAIL;
}
}
}
if (zh->trans_no != 1)
{
- zh->errCode = 2;
- zh->errString = "zebra_begin_trans: write trans not allowed within read trans";
+ zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+ "zebra_begin_trans: no write trans within read");
return ZEBRA_FAIL;
}
if (zh->reg)
}
zh->trans_w_no = zh->trans_no;
- zh->errCode = 0;
+ zebra_clearError(zh);
zh->records_inserted = 0;
zh->records_updated = 0;
zh->trans_no--;
zh->trans_w_no = 0;
- zh->errCode = 2;
- zh->errString = "zebra_begin_trans: cannot open register";
- yaz_log(YLOG_FATAL, zh->errString);
+ zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+ "zebra_begin_trans: cannot open register");
+ yaz_log(YLOG_FATAL, "%s", zh->errString);
return ZEBRA_FAIL;
}
}
zebra_flush_reg (zh);
return ZEBRA_OK;
}
- zh->errCode = 0;
+ zebra_clearError(zh);
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
if (!zh->res)
{
(zh->trans_no)--;
- zh->errCode = 109;
+ zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
return ZEBRA_FAIL;
}
if (!zh->lock_normal || !zh->lock_shadow)
{
(zh->trans_no)--;
- zh->errCode = 2;
+ zh->errCode = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
return ZEBRA_FAIL;
}
zebra_get_state (zh, &val, &seqno);
zebra_unlock (zh->lock_normal);
zebra_unlock (zh->lock_shadow);
zh->trans_no--;
- zh->errCode = 109;
+ zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
return ZEBRA_FAIL;
}
zh->reg->last_val = val;
if (!zh->res || !zh->reg)
{
- zh->errCode = 2;
- zh->errString = "zebra_end_trans: no open transaction";
+ zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+ "zebra_end_trans: no open transaction");
return ZEBRA_FAIL;
}
if (zh->trans_no != zh->trans_w_no)
{
ASSERTZH;
assert(path);
- zh->errCode = 0;
+ zebra_clearError(zh);
yaz_log (log_level, "updating %s", path);
repositoryUpdate (zh, path);
return zh->errCode;
{
ASSERTZH;
assert(path);
- zh->errCode = 0;
+ zebra_clearError(zh);
yaz_log (log_level, "deleting %s", path);
repositoryDelete (zh, path);
return zh->errCode;
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
- zh->errCode = 0;
+ zebra_clearError(zh);
repositoryShow (zh, path);
return zh->errCode;
}
-static int zebra_commit_ex (ZebraHandle zh, int clean_only)
+static int zebra_commit_ex(ZebraHandle zh, int clean_only)
{
int seqno;
char val;
const char *rval;
BFiles bfs;
ASSERTZH;
- zh->errCode = 0;
+ zebra_clearError(zh);
zebra_select_default_database(zh);
if (!zh->res)
{
- zh->errCode = 109;
+ zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
return -1;
}
rval = res_get (zh->res, "shadow");
return 0;
}
-ZEBRA_RES zebra_clean (ZebraHandle zh)
+ZEBRA_RES zebra_clean(ZebraHandle zh)
{
ASSERTZH;
yaz_log(log_level, "zebra_clean");
return zebra_commit_ex(zh, 1);
}
-ZEBRA_RES zebra_commit (ZebraHandle zh)
+ZEBRA_RES zebra_commit(ZebraHandle zh)
{
ASSERTZH;
yaz_log(log_level, "zebra_commit");
return zebra_commit_ex(zh, 0);
}
-ZEBRA_RES zebra_init (ZebraHandle zh)
+ZEBRA_RES zebra_init(ZebraHandle zh)
{
const char *rval;
BFiles bfs = 0;
ASSERTZH;
yaz_log(log_level, "zebra_init");
- zh->errCode = 0;
+ zebra_clearError(zh);
zebra_select_default_database(zh);
if (!zh->res)
{
- zh->errCode = 109;
+ zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+ "cannot select default database");
return ZEBRA_FAIL;
}
rval = res_get (zh->res, "shadow");
bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
if (!bfs)
+ {
+ zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "bfs_create");
return ZEBRA_FAIL;
+ }
if (rval && *rval)
bf_cache (bfs, rval);
return ZEBRA_OK;
}
-int zebra_compact (ZebraHandle zh)
+ZEBRA_RES zebra_compact(ZebraHandle zh)
{
BFiles bfs;
ASSERTZH;
yaz_log(log_level, "zebra_compact");
- zh->errCode = 0;
+ zebra_clearError(zh);
if (!zh->res)
{
- zh->errCode = 109;
- return -1;
+ zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+ return ZEBRA_FAIL;
}
bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
inv_compact (bfs);
bfs_destroy (bfs);
- return 0;
+ return ZEBRA_OK;
}
-int zebra_result (ZebraHandle zh, int *code, char **addinfo)
+void zebra_result(ZebraHandle zh, int *code, char **addinfo)
{
ASSERTZH;
yaz_log(log_level, "zebra_result");
*code = zh->errCode;
*addinfo = zh->errString;
- return 0;
}
-void zebra_shadow_enable (ZebraHandle zh, int value)
+void zebra_shadow_enable(ZebraHandle zh, int value)
{
ASSERTZH;
yaz_log(log_level, "zebra_shadow_enable");
- zh->errCode = 0;
+ zebra_clearError(zh);
zh->shadow_enable = value;
}
ASSERTZH;
assert(encoding);
yaz_log(log_level, "zebra_octet_term_encoding");
- zh->errCode = 0;
+ zebra_clearError(zh);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
{
ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
- zh->errCode = 0;
+ zebra_clearError(zh);
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
ASSERTZH;
assert(name);
assert(value);
- yaz_log(log_level, "zebra_set_resource %s:%s",name,value);
- zh->errCode = 0;
+ yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
+ zebra_clearError(zh);
res_set(zh->res, name, value);
}
ASSERTZH;
assert(name);
assert(defaultvalue);
- v= res_get_def( zh->res, name, (char *)defaultvalue);
- zh->errCode = 0;
- yaz_log(log_level, "zebra_get_resource %s:%s",name,v);
+ v = res_get_def (zh->res, name, (char *)defaultvalue);
+ zebra_clearError(zh);
+ yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
return v;
}
{
ASSERTZH;
yaz_log(log_level, "zebra_get_shadow_enable");
- return (zh->shadow_enable);
+ return zh->shadow_enable;
}
void zebra_set_shadow_enable (ZebraHandle zh, int value)
Searching
*/
-ZEBRA_RES zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
- const char *setname, zint *numhits)
+ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query,
+ const char *setname, zint *numhits)
{
zint hits = 0;
ZEBRA_RES res = ZEBRA_OK;
if (!query)
{
yaz_log (YLOG_WARN, "bad query %s\n", pqf_query);
+ zh->errCode = YAZ_BIB1_MALFORMED_QUERY;
res = ZEBRA_FAIL;
}
else
- res = zebra_search_RPN (zh, odr, query, setname, &hits);
+ res = zebra_search_RPN(zh, odr, query, setname, &hits);
odr_destroy(odr);
if (!sort_sequence)
{
yaz_log(YLOG_WARN, "invalid sort specs '%s'", sort_spec);
- zh->errCode = 207;
+ zh->errCode = YAZ_BIB1_CANNOT_SORT_ACCORDING_TO_SEQUENCE;
return -1;
}
return sort_status;
}
+/* ---------------------------------------------------------------------------
+ Get BFS for Zebra system (to make alternative storage methods)
+*/
struct BFiles_struct *zebra_get_bfs(ZebraHandle zh)
{
if (zh && zh->reg)
return zh->reg->bfs;
return 0;
}
+
+
+/* ---------------------------------------------------------------------------
+ Set limit for search/scan
+*/
+ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
+{
+ ASSERTZH;
+ zebra_limit_destroy(zh->m_limit);
+ zh->m_limit = zebra_limit_create(complement_flag, ids);
+ return ZEBRA_OK;
+}
+
+/*
+ Set Error code + addinfo
+*/
+void zebra_setError(ZebraHandle zh, int code, const char *addinfo)
+{
+ zh->errCode = code;
+ nmem_reset(zh->nmem_error);
+ zh->errString = addinfo ? nmem_strdup(zh->nmem_error, addinfo) : 0;
+}
+
+void zebra_setError_zint(ZebraHandle zh, int code, zint i)
+{
+ char vstr[60];
+ sprintf(vstr, ZINT_FORMAT, i);
+
+ zh->errCode = code;
+ nmem_reset(zh->nmem_error);
+ zh->errString = nmem_strdup(zh->nmem_error, vstr);
+}
+
projects / idzebra-moved-to-github.git / blobdiff