-/* $Id: zebraapi.c,v 1.180 2005-08-09 09:35:25 adam Exp $
+/* $Id: zebraapi.c,v 1.199 2005-12-09 11:33:32 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
static int log_level = 0;
static int log_level_initialized = 0;
-static Res zebra_open_res (ZebraHandle zh);
-static void zebra_close_res (ZebraHandle zh);
+static void zebra_open_res(ZebraHandle zh);
+static void zebra_close_res(ZebraHandle zh);
static void zebra_chdir (ZebraService zs)
{
{
ASSERTZH;
yaz_log(log_level, "zebra_flush_reg");
- zebra_clearError(zh);
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh, 1 /* final */);
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 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);
-ZebraHandle zebra_open (ZebraService zs)
+ZebraHandle zebra_open(ZebraService zs, Res res)
{
ZebraHandle zh;
const char *default_encoding;
zh->errCode = 0;
zh->errString = 0;
zh->res = 0;
+ zh->session_res = res_open(zs->global_res, res);
zh->user_perm = 0;
+ zh->dbaccesslist = 0;
zh->reg_name = xstrdup ("");
zh->path_reg = 0;
zh->lock_shadow = 0;
zh->shadow_enable = 1;
+ zh->m_staticrank = 0;
- default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1");
+ default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
zh->iconv_to_utf8 =
yaz_iconv_open ("UTF-8", default_encoding);
log_level = yaz_log_module_level("zebraapi");
log_level_initialized = 1;
}
+
+ yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+ configName ? configName : "");
- yaz_log(YLOG_LOG, "zebra_start %s %s",configName, ZEBRAVER);
- assert(configName);
-
- if ((res = res_open (configName, def_res, over_res)))
+ if ((res = res_open(def_res, over_res)))
{
const char *passwd_plain = 0;
const char *passwd_encrypt = 0;
+ const char *dbaccess = 0;
ZebraService zh = xmalloc(sizeof(*zh));
- yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
-
+ if (configName)
+ res_read_file(res, configName);
+
zh->global_res = res;
- zh->configName = xstrdup(configName);
zh->sessions = 0;
zebra_chdir (zh);
zebra_mutex_cond_init (&zh->session_lock);
passwd_plain = res_get (zh->global_res, "passwd");
passwd_encrypt = res_get (zh->global_res, "passwd.c");
+ dbaccess = res_get (zh->global_res, "dbaccess");
if (!passwd_plain && !passwd_encrypt)
zh->passwd_db = NULL;
- else
+ else
{
zh->passwd_db = passwd_db_open();
if (!zh->passwd_db)
passwd_db_file_crypt(zh->passwd_db, passwd_encrypt);
}
}
+
+ if (!dbaccess)
+ zh->dbaccess = NULL;
+ else {
+ zh->dbaccess = res_open(NULL, NULL);
+ if (res_read_file(zh->dbaccess, dbaccess) != ZEBRA_OK) {
+ yaz_log(YLOG_FATAL, "Failed to read %s", dbaccess);
+ return NULL;
+ }
+ }
+
zh->path_root = res_get (zh->global_res, "root");
zh->nmem = nmem_create();
zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
}
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 *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;
reg->key_buf = 0;
- reg->keys.buf_max = 0;
- reg->keys.buf = 0;
- reg->keys.codec_handle = iscz1_start();
+ reg->keys = zebra_rec_keys_open();
+#if NATTR
+ reg->sortKeys = zebra_rec_keys_open();
+#else
reg->sortKeys.buf = 0;
reg->sortKeys.buf_max = 0;
-#if NATTR
- reg->sortKeys.codec_handle = iscz1_start();
#endif
reg->records = 0;
reg->key_file_no = 0;
reg->ptr_i = 0;
- zebraRankInstall (reg, rank1_class);
- zebraRankInstall (reg, rankzv_class);
+ zebraRankInstall (reg, rank_1_class);
+ zebraRankInstall (reg, rank_zv_class);
+ zebraRankInstall (reg, rank_static_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_shutdown");
- 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");
- zebra_clearError(zh);
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
zebra_mutex_cond_unlock (&zs->session_lock);
bfs_destroy (reg->bfs);
data1_destroy (reg->dh);
- xfree(reg->sortKeys.buf);
- xfree(reg->keys.buf);
- if (reg->keys.codec_handle)
- iscz1_stop(reg->keys.codec_handle);
+ zebra_rec_keys_close(reg->keys);
#if NATTR
- if (reg->sortKeys.codec_handle)
- iscz1_stop(reg->sortKeys.codec_handle);
+ zebra_rec_keys_close(reg->sortKeys);
+#else
+ xfree(reg->sortKeys.buf);
#endif
+
xfree(reg->key_buf);
xfree(reg->name);
xfree(reg);
recTypeClass_destroy(zs->record_classes);
nmem_destroy(zs->nmem);
res_close (zs->global_res);
- xfree(zs->configName);
xfree(zs);
return ZEBRA_OK;
}
if (zh->reg)
zebra_register_close (zh->service, zh->reg);
zebra_close_res (zh);
+ res_close(zh->session_res);
xfree(zh->record_encoding);
+ xfree(zh->dbaccesslist);
+
for (i = 0; i < zh->num_basenames; i++)
xfree(zh->basenames[i]);
xfree(zh->basenames);
int new_num_max;
};
-static Res zebra_open_res (ZebraHandle zh)
+static void zebra_open_res(ZebraHandle zh)
{
- Res res = 0;
char fname[512];
ASSERTZH;
zh->errCode = 0;
if (zh->path_reg)
{
- sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
- res = res_open (fname, zh->service->global_res, 0);
- if (!res)
- res = zh->service->global_res;
+ sprintf(fname, "%.200s/zebra.cfg", zh->path_reg);
+ zh->res = res_open(zh->session_res, 0);
+ res_read_file(zh->res, fname);
}
else if (*zh->reg_name == 0)
{
- res = zh->service->global_res;
+ zh->res = res_open(zh->session_res, 0);
}
else
{
yaz_log (YLOG_WARN, "no register root specified");
- return 0; /* no path for register - fail! */
+ zh->res = 0; /* no path for register - fail! */
}
- return res;
}
static void zebra_close_res (ZebraHandle zh)
{
ASSERTZH;
zh->errCode = 0;
- if (zh->res != zh->service->global_res)
- res_close (zh->res);
+ res_close (zh->res);
zh->res = 0;
}
strcat (zh->path_reg, zh->reg_name);
}
}
- zh->res = zebra_open_res (zh);
+ zebra_open_res(zh);
if (zh->lock_normal)
zebra_lock_destroy (zh->lock_normal);
if (zh->res)
{
char fname[512];
- const char *lock_area =res_get (zh->res, "lockDir");
+ const char *lock_area = res_get (zh->res, "lockDir");
if (!lock_area && zh->path_reg)
res_set (zh->res, "lockDir", zh->path_reg);
if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK)
zebra_set_approx_limit(zh, approx);
}
+ if (zh->res)
+ {
+ if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
+ yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
+ else
+ yaz_log(YLOG_LOG, "static rank unset");
+ }
}
void map_basenames_func (void *vp, const char *name, const char *value)
/* no database has been selected - so we select based on
resource setting (including group)
*/
- const char *group = res_get(zh->service->global_res, "group");
- const char *v = res_get_prefix(zh->service->global_res,
+ const char *group = res_get(zh->session_res, "group");
+ const char *v = res_get_prefix(zh->session_res,
"database", group, "Default");
return zebra_select_database(zh, v);
}
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);
+ res_trav (zh->session_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)
zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
return ZEBRA_FAIL;
}
+
+ /* Check if the user has access to all databases (Seb) */
+ /* You could argue that this should happen later, after we have
+ * determined that the database(s) exist. */
+ if (zh->dbaccesslist) {
+ for (i = 0; i < num_bases; i++) {
+ const char *db = basenames[i];
+ char *p, *pp;
+ for (p = zh->dbaccesslist; p && *p; p = pp) {
+ int len;
+ if ((pp = strchr(p, '+'))) {
+ len = pp - p;
+ pp++;
+ }
+ else
+ len = strlen(p);
+ if (len == strlen(db) && !strncmp(db, p, len))
+ break;
+ }
+ if (!p) {
+ zh->errCode = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED;
+ return ZEBRA_FAIL;
+ }
+ }
+ }
+
for (i = 0; i < zh->num_basenames; i++)
xfree(zh->basenames[i]);
xfree(zh->basenames);
assert(hits);
assert(setname);
yaz_log(log_level, "zebra_search_rpn");
- zebra_clearError(zh);
zh->hits = 0;
*hits = 0;
yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs);
- zebra_clearError(zh);
if (!zh->res)
{
zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
assert(is_partial);
assert(entries);
yaz_log(log_level, "zebra_scan");
- zebra_clearError(zh);
+
if (zebra_begin_read (zh) == ZEBRA_FAIL)
{
*entries = 0;
assert(sort_sequence);
assert(sort_status);
yaz_log(log_level, "zebra_sort");
- zebra_clearError(zh);
+
if (zebra_begin_read(zh) == ZEBRA_FAIL)
return ZEBRA_FAIL;
res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames,
ASSERTZH;
assert(statuses);
yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
- zebra_clearError(zh);;
+
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
return a;
}
-void zebra_clearError(ZebraHandle zh)
-{
- if (zh)
- {
- zh->errCode = 0;
- zh->errString = 0;
- }
-}
-
ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
{
const char *p;
+ const char *astring;
char u[40];
ZebraService zs;
ASSERTZH;
- zebra_clearError(zh);
+
zs= zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
xfree(zh->user_perm);
zh->user_perm = xstrdup(p ? p : "r");
+ /* Determine database access list */
+ astring = res_get(zs->dbaccess, user ? user : "anonymous");
+ if (astring)
+ zh->dbaccesslist = xstrdup(astring);
+ else
+ zh->dbaccesslist = 0;
+
/* users that don't require a password .. */
if (zh->user_perm && strchr(zh->user_perm, 'a'))
return ZEBRA_OK;
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s",
database, record_type);
- 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");
- zebra_clearError(zh);
return zebra_end_trans(zh);
}
int i;
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_segment");
- zebra_clearError(zh);
+
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
Odr_oct *oct = fragment->u.notExternallyTagged;
sysno = 0;
- if ( zebra_update_record(zh,
- 0, /* record Type */
- &sysno,
- 0, /* match */
- 0, /* fname */
- oct->buf, oct->len,
- 0) == ZEBRA_FAIL)
+ if (zebra_update_record(zh,
+ 0, /* record Type */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ (const char *) oct->buf, oct->len,
+ 0) == ZEBRA_FAIL)
res = ZEBRA_FAIL;
}
}
assert(rec_buf);
yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
- zebra_clearError(zh);
if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
+ {
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "no record ID or empty record ID");
return ZEBRA_FAIL;
+ }
memcpy (recid_z, recid_buf, recid_len);
recid_z[recid_len] = 0;
{
if (action == 1) /* fail if insert */
{
- zebra_end_trans(zh);
- return ZEBRA_FAIL;
+ zebra_end_trans(zh);
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "Cannot insert record: already exist");
+ return ZEBRA_FAIL;
}
memcpy (&sysno, rinfo+1, sizeof(sysno));
if (action == 2 || action == 3) /* fail if delete or update */
{
zebra_end_trans(zh);
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "Cannot delete/update record: does not exist");
return ZEBRA_FAIL;
}
action = 1; /* make it an insert (if it's an update).. */
&sysno,
0, /* match */
0, /* fname */
- 0, /* force update */
+ 0, /* force update */
1 /* allow update */
);
+ if (res == ZEBRA_FAIL)
+ {
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "Unable to parse record");
+ }
if (action == 1)
{
dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
ZEBRA_RES ret = ZEBRA_OK;
ASSERTZH;
yaz_log(log_level, "zebra_drop_database %s", db);
- zebra_clearError(zh);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
else
{
yaz_log(YLOG_WARN, "drop database only supported for isam:b");
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "drop database only supported for isam:b");
ret = ZEBRA_FAIL;
}
zebra_end_trans (zh);
ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", db);
assert(db);
- zebra_clearError(zh);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
assert(input_str);
assert(output_str);
yaz_log(log_level, "zebra_string_norm ");
- 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);
- 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 ");
- 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");
}
zh->trans_w_no = zh->trans_no;
- zebra_clearError(zh);
-
zh->records_inserted = 0;
zh->records_updated = 0;
zh->records_deleted = 0;
}
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 = 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_flush_reg (zh);
return ZEBRA_OK;
}
- zebra_clearError(zh);
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
resultSetInvalidate (zh);
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);
+ 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);
{
ASSERTZH;
assert(path);
- zebra_clearError(zh);
yaz_log (log_level, "updating %s", path);
repositoryUpdate (zh, path);
- return zh->errCode;
+ return 0;
}
int zebra_repository_delete (ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
- zebra_clearError(zh);
yaz_log (log_level, "deleting %s", path);
repositoryDelete (zh, path);
- return zh->errCode;
+ return 0;
}
int zebra_repository_show (ZebraHandle zh, const char *path)
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
- zebra_clearError(zh);
repositoryShow (zh, path);
- return zh->errCode;
+ return 0;
}
-static int zebra_commit_ex(ZebraHandle zh, int clean_only)
+static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
{
int seqno;
char val;
const char *rval;
BFiles bfs;
ASSERTZH;
- zebra_clearError(zh);
zebra_select_default_database(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
- return -1;
+ return ZEBRA_FAIL;
}
rval = res_get (zh->res, "shadow");
if (!rval)
{
yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined");
- return 0;
+ return ZEBRA_OK;
}
zebra_lock_w (zh->lock_normal);
zebra_unlock (zh->lock_shadow);
zebra_unlock (zh->lock_normal);
- return 0;
+ return ZEBRA_OK;
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
BFiles bfs = 0;
ASSERTZH;
yaz_log(log_level, "zebra_init");
- zebra_clearError(zh);
zebra_select_default_database(zh);
if (!zh->res)
BFiles bfs;
ASSERTZH;
yaz_log(log_level, "zebra_compact");
- zebra_clearError(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
{
ASSERTZH;
yaz_log(log_level, "zebra_shadow_enable");
- zebra_clearError(zh);
zh->shadow_enable = value;
}
{
ASSERTZH;
assert(encoding);
- yaz_log(log_level, "zebra_octet_term_encoding");
- zebra_clearError(zh);
+ yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
{
ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
- zebra_clearError(zh);
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
assert(name);
assert(value);
yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
- zebra_clearError(zh);
res_set(zh->res, name, value);
}
const char *v;
ASSERTZH;
assert(name);
- assert(defaultvalue);
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;
}
int zebra_add_record(ZebraHandle zh,
const char *buf, int buf_size)
{
- SYSNO sysno = 0;
- return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0);
+ return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0);
}
ZEBRA_RES zebra_insert_record (ZebraHandle zh,
{
ZEBRA_RES res;
ASSERTZH;
- assert(sysno);
assert(buf);
- yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, *sysno);
+ yaz_log(log_level, "zebra_update_record");
+ if (sysno)
+ yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
projects / idzebra-moved-to-github.git / blobdiff