-/* $Id: zebraapi.c,v 1.210 2006-03-31 15:58:04 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: zebraapi.c,v 1.219 2006-05-30 13:21:16 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include "index.h"
+#include "rank.h"
#include "orddict.h"
#include <charmap.h>
#include <idzebra/api.h>
static void zebra_open_res(ZebraHandle zh);
static void zebra_close_res(ZebraHandle zh);
+static ZEBRA_RES zebra_check_handle(ZebraHandle zh)
+{
+ if (zh)
+ return ZEBRA_OK;
+ return ZEBRA_FAIL;
+}
+
+#define ZEBRA_CHECK_HANDLE(zh) if (zebra_check_handle(zh) != ZEBRA_OK) return ZEBRA_FAIL
+
static void zebra_chdir (ZebraService zs)
{
const char *dir ;
#endif
}
-static void zebra_flush_reg (ZebraHandle zh)
+static ZEBRA_RES zebra_flush_reg (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_flush_reg");
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh, 1 /* final */);
zebra_index_merge (zh );
+ return ZEBRA_OK;
}
static struct zebra_register *zebra_register_open(ZebraService zs,
zh->path_root = res_get (zh->global_res, "root");
zh->nmem = nmem_create();
zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
+
+ if (1)
+ {
+ const char *module_path = res_get(res, "modulePath");
+ if (module_path)
+ recTypeClass_load_modules(&zh->record_classes, zh->nmem,
+ module_path);
+ }
return zh;
}
return 0;
reg->keys = zebra_rec_keys_open();
-#if NATTR
reg->sortKeys = zebra_rec_keys_open();
-#else
- reg->sortKeys.buf = 0;
- reg->sortKeys.buf_max = 0;
-#endif
reg->records = 0;
reg->dict = 0;
reg->key_file_no = 0;
reg->ptr_i = 0;
+ /* installing rank classes */
zebraRankInstall (reg, rank_1_class);
zebraRankInstall (reg, rank_zv_class);
+ zebraRankInstall (reg, rank_similarity_class);
zebraRankInstall (reg, rank_static_class);
recordCompression = res_get_def (res, "recordCompression", "none");
ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_shutdown");
zebra_mutex_cond_lock (&zh->service->session_lock);
ZEBRA_RES zebra_admin_start (ZebraHandle zh)
{
ZebraService zs;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_start");
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
data1_destroy (reg->dh);
zebra_rec_keys_close(reg->keys);
-#if NATTR
zebra_rec_keys_close(reg->sortKeys);
-#else
- xfree(reg->sortKeys.buf);
-#endif
xfree(reg->key_buf);
xfree(reg->name);
return ZEBRA_OK;
}
-ZEBRA_RES zebra_close (ZebraHandle zh)
+ZEBRA_RES zebra_close(ZebraHandle zh)
{
ZebraService zs;
struct zebra_session **sp;
int i;
yaz_log(log_level, "zebra_close");
- if (!zh)
- return ZEBRA_OK;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
zh->errCode = 0;
zs = zh->service;
{
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");
}
}
ZEBRA_RES zebra_select_database (ZebraHandle zh, const char *basename)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
yaz_log(log_level, "zebra_select_database %s",basename);
assert(basename);
return zebra_select_databases (zh, 1, &basename);
const char *cp;
int len = 0;
char *new_reg = 0;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(basenames);
yaz_log(log_level, "zebra_select_databases n=%d [0]=%s",
const char *setname, zint *hits)
{
ZEBRA_RES r;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(o);
assert(query);
assert(hits);
int i;
ZEBRA_RES ret = ZEBRA_OK;
zint *pos_array;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(setname);
assert(recs);
{
ZEBRA_RES res;
RSET limit_rset = 0;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(stream);
assert(zapt);
assert(position);
int *sort_status)
{
ZEBRA_RES res;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(num_input_setnames>0);
assert(input_setnames);
char u[40];
ZebraService zs;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
- zs= zh->service;
+ zs = zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
p = res_get(zs->global_res, u);
ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
const char *record_type)
{
- ASSERTZH;
yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s",
database, record_type);
if (zebra_select_database(zh, database) == ZEBRA_FAIL)
ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_import_end");
return zebra_end_trans(zh);
}
ZEBRA_RES res = ZEBRA_OK;
SYSNO sysno;
int i;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
yaz_log(log_level, "zebra_admin_import_segment");
for (i = 0; i<segment->num_segmentRecords; i++)
char *rinfo = 0;
char recid_z[256];
int db_ord;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
assert(action>0 && action <=4);
assert(rec_buf);
ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
{
ZEBRA_RES ret = ZEBRA_OK;
- ASSERTZH;
+
yaz_log(log_level, "zebra_drop_database %s", db);
+ ZEBRA_CHECK_HANDLE(zh);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
{
- ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", db);
+ ZEBRA_CHECK_HANDLE(zh);
assert(db);
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
zebra_select_default_database(zh);
if (!zh->res)
{
if (zh->trans_no != 1)
{
- zebra_flush_reg (zh);
- return ZEBRA_OK;
+ return zebra_flush_reg (zh);
}
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
ZEBRA_RES zebra_end_trans (ZebraHandle zh)
{
ZebraTransactionStatus dummy;
- ASSERTZH;
+
yaz_log(log_level, "zebra_end_trans");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_end_transaction(zh, &dummy);
}
int seqno;
const char *rval;
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(status);
yaz_log(log_level, "zebra_end_transaction");
return ZEBRA_OK;
}
-int zebra_repository_update (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log (log_level, "updating %s", path);
- repositoryUpdate (zh, path);
- return 0;
+
+ if (zh->m_record_id && !strcmp (zh->m_record_id, "file"))
+ return zebra_update_file_match(zh, path);
+ else
+ return zebra_update_from_path(zh, path);
}
-int zebra_repository_delete (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log (log_level, "deleting %s", path);
- repositoryDelete (zh, path);
- return 0;
+ return zebra_delete_from_path(zh, path);
}
-int zebra_repository_show (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
repositoryShow (zh, path);
- return 0;
+ return ZEBRA_OK;
}
static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
zebra_lock_r (zh->lock_shadow);
bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
-
+ if (!bfs)
+ {
+ zebra_unlock(zh->lock_shadow);
+ zebra_unlock(zh->lock_normal);
+ return ZEBRA_FAIL;
+ }
zebra_get_state (zh, &val, &seqno);
if (rval && *rval)
sync ();
#endif
}
- yaz_log (YLOG_DEBUG, "commit clean");
- bf_commitClean (bfs, rval);
seqno++;
zebra_set_state (zh, 'o', seqno);
+
+ zebra_unlock (zh->lock_shadow);
+ zebra_unlock (zh->lock_normal);
+
+ zebra_lock_w(zh->lock_shadow);
+ bf_commitClean (bfs, rval);
+ zebra_unlock (zh->lock_normal);
}
else
{
+ zebra_unlock(zh->lock_shadow);
+ zebra_unlock(zh->lock_normal);
yaz_log (log_level, "nothing to commit");
}
bfs_destroy (bfs);
- zebra_unlock (zh->lock_shadow);
- zebra_unlock (zh->lock_normal);
return ZEBRA_OK;
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_clean");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_commit_ex(zh, 1);
}
ZEBRA_RES zebra_commit(ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_commit");
+ ZEBRA_CHECK_HANDLE(zh);
return zebra_commit_ex(zh, 0);
}
+
ZEBRA_RES zebra_init(ZebraHandle zh)
{
const char *rval;
BFiles bfs = 0;
- ASSERTZH;
+
yaz_log(log_level, "zebra_init");
+ ZEBRA_CHECK_HANDLE(zh);
+
zebra_select_default_database(zh);
if (!zh->res)
{
ZEBRA_RES zebra_compact(ZebraHandle zh)
{
BFiles bfs;
- ASSERTZH;
+
yaz_log(log_level, "zebra_compact");
+ ZEBRA_CHECK_HANDLE(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
void zebra_result(ZebraHandle zh, int *code, char **addinfo)
{
- ASSERTZH;
yaz_log(log_level, "zebra_result");
- *code = zh->errCode;
- *addinfo = zh->errString;
+ if (zh)
+ {
+ *code = zh->errCode;
+ *addinfo = zh->errString;
+ }
+ else
+ {
+ *code = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+ *addinfo ="ZebraHandle is NULL";
+ }
}
void zebra_shadow_enable(ZebraHandle zh, int value)
ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
{
- ASSERTZH;
- assert(encoding);
yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
+ ZEBRA_CHECK_HANDLE(zh);
+ assert(encoding);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
- ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
+ ZEBRA_CHECK_HANDLE(zh);
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
{
- ASSERTZH;
assert(name);
assert(value);
yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
+ ASSERTZH;
res_set(zh->res, name, value);
}
int zebra_trans_no (ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_trans_no");
+ ASSERTZH;
return zh->trans_no;
}
int zebra_get_shadow_enable (ZebraHandle zh)
{
- ASSERTZH;
yaz_log(log_level, "zebra_get_shadow_enable");
+ ASSERTZH;
return zh->shadow_enable;
}
void zebra_set_shadow_enable (ZebraHandle zh, int value)
{
- ASSERTZH;
yaz_log(log_level, "zebra_set_shadow_enable %d",value);
+ ASSERTZH;
zh->shadow_enable = value;
}
-/* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve
- so that it's identicical to the original api_records_retrieve */
-void api_records_retrieve (ZebraHandle zh, ODR stream,
- const char *setname, Z_RecordComposition *comp,
- oid_value input_format, int num_recs,
- ZebraRetrievalRecord *recs)
-{
- zebra_records_retrieve(zh, stream, setname, comp, input_format,
- num_recs, recs);
-}
-
-/* ---------------------------------------------------------------------------
- Record insert(=update), delete
-
- If sysno is provided, then it's used to identify the record.
- If not, and match_criteria is provided, then sysno is guessed
- If not, and a record is provided, then sysno is got from there
-NOTE: Now returns 0 at success and updates sysno, which is an int*
- 20-jun-2003 Heikki
-*/
-
-int zebra_add_record(ZebraHandle zh,
- const char *buf, int buf_size)
+ZEBRA_RES zebra_add_record(ZebraHandle zh,
+ const char *buf, int buf_size)
{
return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0);
}
-ZEBRA_RES zebra_insert_record (ZebraHandle zh,
- const char *recordType,
- SYSNO *sysno, const char *match,
- const char *fname,
- const char *buf, int buf_size, int force_update)
+ZEBRA_RES zebra_insert_record(ZebraHandle zh,
+ const char *recordType,
+ SYSNO *sysno, const char *match,
+ const char *fname,
+ const char *buf, int buf_size, int force_update)
{
ZEBRA_RES res;
ASSERTZH;
int force_update)
{
ZEBRA_RES res;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(buf);
yaz_log(log_level, "zebra_update_record");
int force_update)
{
ZEBRA_RES res;
- ASSERTZH;
- assert(sysno);
+
+ ZEBRA_CHECK_HANDLE(zh);
+
assert(buf);
- yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+ yaz_log(log_level, "zebra_delete_record");
+ if (sysno)
+ yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
zint lhits = 0;
ZEBRA_RES res = ZEBRA_OK;
Z_RPNQuery *query;
- ODR odr = odr_createmem(ODR_ENCODE);
- ASSERTZH;
+ ODR odr;
+
+ ZEBRA_CHECK_HANDLE(zh);
+
+ odr = odr_createmem(ODR_ENCODE);
+
assert(pqf_query);
assert(setname);
int num_input_setnames = 0;
int sort_status = 0;
Z_SortKeySpecList *sort_sequence;
- ASSERTZH;
+
+ ZEBRA_CHECK_HANDLE(zh);
assert(stream);
assert(sort_spec);
assert(output_setname);
*/
ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
{
- ASSERTZH;
+ ZEBRA_CHECK_HANDLE(zh);
zebra_limit_destroy(zh->m_limit);
zh->m_limit = zebra_limit_create(complement_flag, ids);
return ZEBRA_OK;
*/
void zebra_setError(ZebraHandle zh, int code, const char *addinfo)
{
+ if (!zh)
+ return;
zh->errCode = code;
nmem_reset(zh->nmem_error);
zh->errString = addinfo ? nmem_strdup(zh->nmem_error, addinfo) : 0;
strcat (path, "/");
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+