-/* $Id: zebraapi.c,v 1.124 2004-08-10 08:19:15 heikki Exp $
+/* $Id: zebraapi.c,v 1.137 2004-10-26 15:32:11 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#include <assert.h>
#include <stdio.h>
+#include <limits.h>
#ifdef WIN32
#include <io.h>
#include <process.h>
#include <yaz/sortspec.h>
#include "index.h"
#include <charmap.h>
-#include "zebraapi.h"
+#include <idzebra/api.h>
/* simple asserts to validate the most essential input args */
#define ASSERTZH assert(zh && zh->service)
#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);
{
ZebraHandle zh;
const char *default_encoding;
- ASSERTZS;
yaz_log(LOG_API,"zebra_open");
if (!zs)
{
Res res;
- yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName);
+ yaz_log(LOG_API,"zebra_start %s",configName);
+ assert(configName);
if ((res = res_open (configName, def_res, over_res)))
{
res_get (zh->global_res, "passwd"));
}
zh->path_root = res_get (zh->global_res, "root");
+ zh->nmem = nmem_create();
+ zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
return zh;
}
return 0;
}
+void zebra_filter_info(ZebraService zs, void *cd,
+ void (*cb)(void *cd, const char *name))
+{
+ ASSERTZS;
+ assert(cb);
+ recTypeClass_info(zs->record_classes, cd, cb);
+}
void zebra_pidfname(ZebraService zs, char *path)
{
+ ASSERTZS;
zebra_lock_prefix (zs->global_res, path);
strcat(path, "zebrasrv.pid");
}
+Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
+ int compact_flag, Res res)
+{
+ int page_size = 4096;
+ char resource_str[200];
+ const char *v;
+ sprintf (resource_str, "dict.%.100s.pagesize", name);
+ assert(bfs);
+ assert(name);
+
+ v = res_get(res, resource_str);
+ if (v)
+ {
+ page_size = atoi(v);
+ yaz_log(LOG_LOG, "Using custom dictionary page size %d for %s",
+ page_size, name);
+ }
+ return dict_open(bfs, name, cache, rw, compact_flag, page_size);
+}
+
+
static
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
int rw, int useshadow, Res res,
assert (res);
- yaz_log (LOG_LOG|LOG_API, "zebra_register_open rw = %d useshadow=%d p=%p,n=%s,rp=%s",
+ yaz_log (LOG_DEBUG, "zebra_register_open rw=%d useshadow=%d p=%p n=%s rp=%s",
rw, useshadow, reg, name, reg_path ? reg_path : "(none)");
reg->dh = data1_createx (DATA1_FLAG_XML);
getcwd(cwd, sizeof(cwd)-1);
profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH);
- yaz_log(LOG_LOG, "profilePath=%s cwd=%s", profilePath, cwd);
+ yaz_log(LOG_DEBUG, "profilePath=%s cwd=%s", profilePath, cwd);
data1_set_tabpath (reg->dh, profilePath);
data1_set_tabroot (reg->dh, reg_path);
- reg->recTypes = recTypes_init (reg->dh);
- recTypes_default_handlers (reg->recTypes);
+ reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
reg->zebra_maps = zebra_maps_open (res, reg_path);
reg->rank_classes = NULL;
reg->keys.buf_max = 0;
reg->keys.buf = 0;
-#if IT_KEY_NEW
reg->keys.codec_handle = iscz1_start();
-#endif
reg->sortKeys.buf = 0;
reg->sortKeys.buf_max = 0;
reg->ptr_i=0;
zebraRankInstall (reg, rank1_class);
+#ifdef SKIPTHIS /* FIXME - those ranks not yet converted to new interface */
zebraRankInstall (reg, rankzv_class);
zebraRankInstall (reg, rankliv_class);
+#endif
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
}
if (rw)
{
- reg->matchDict = dict_open (reg->bfs, GMATCH_DICT, 20, 1, 0);
+ reg->matchDict = dict_open_res (reg->bfs, GMATCH_DICT, 20, 1, 0, res);
}
- if (!(reg->dict = dict_open (reg->bfs, FNAME_DICT, 40, rw, 0)))
+ if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res)))
{
logf (LOG_WARN, "dict_open");
return 0;
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
{
ASSERTZS;
- yaz_log(LOG_LOG|LOG_API, "zebra_register_close p=%p", reg);
+ assert(reg);
+ yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
if (reg->records)
xfree (reg->sortKeys.buf);
xfree (reg->keys.buf);
-#if IT_KEY_NEW
if (reg->keys.codec_handle)
iscz1_stop(reg->keys.codec_handle);
-#endif
-
xfree (reg->key_buf);
xfree (reg->name);
xfree (reg);
{
if (!zs)
return 0;
- yaz_log (LOG_LOG|LOG_API, "zebra_stop");
+ yaz_log (LOG_API, "zebra_stop");
while (zs->sessions)
{
if (zs->passwd_db)
passwd_db_close (zs->passwd_db);
+ recTypeClass_destroy(zs->record_classes);
+ nmem_destroy(zs->nmem);
res_close (zs->global_res);
xfree (zs->configName);
xfree (zs);
struct map_baseinfo *p = (struct map_baseinfo *) vp;
int i, no;
char fromdb[128], todb[8][128];
+
+ assert(value);
+ assert(name);
+ assert(vp);
no =
sscanf (value, "%127s %127s %127s %127s %127s %127s %127s %127s %127s",
int i;
ASSERTZH;
yaz_log(LOG_API,"map_basenames ");
+ assert(stream);
+
zh->errCode=0;
info.zh = zh;
*num_bases = info.new_num_bases;
*basenames = info.new_basenames;
for (i = 0; i<*num_bases; i++)
- logf (LOG_LOG, "base %s", (*basenames)[i]);
+ logf (LOG_DEBUG, "base %s", (*basenames)[i]);
}
int zebra_select_database (ZebraHandle zh, const char *basename)
{
ASSERTZH;
yaz_log(LOG_API,"zebra_select_database %s",basename);
+ assert(basename);
zh->errCode=0;
return zebra_select_databases (zh, 1, &basename);
}
int len = 0;
char *new_reg = 0;
ASSERTZH;
+ assert(basenames);
+
yaz_log(LOG_API,"zebra_select_databases n=%d [0]=%s",
num_bases,basenames[0]);
zh->errCode=0;
int zebra_search_RPN (ZebraHandle zh, ODR o,
Z_RPNQuery *query, const char *setname, int *hits)
{
+ const char *max;
+ zint maxhits;
ASSERTZH;
+ assert(o);
+ assert(query);
+ assert(hits);
+ assert(setname);
yaz_log(LOG_API,"zebra_search_rpn");
zh->errCode=0;
zh->hits = 0;
if (zebra_begin_read (zh))
return 1;
+#ifdef SKIPTHIS /* FIXME - livcode rank not yet available */
zebra_livcode_transform(zh, query);
+#endif
resultSetAddRPN (zh, odr_extract_mem(o), query,
zh->num_basenames, zh->basenames, setname);
zebra_end_read (zh);
-
- *hits = zh->hits;
+ max = res_get (zh->res, "maxhits");
+ if (max)
+ maxhits=atoi(max);
+ else {
+ int i=0;
+ maxhits=INT_MAX; /* properly rounded, to make it look like a limit*/
+ while (maxhits>100) { maxhits/=10; i++;}
+ while (i--) maxhits *= 10;
+ }
+ if (zh->hits > maxhits) { /* too large for yaz to handle */
+ logf(LOG_DEBUG,"limiting hits to "ZINT_FORMAT, maxhits);
+ *hits=maxhits;
+ }
+ else
+ *hits = zh->hits;
return 0;
}
ZebraPosSet poset;
int i, *pos_array, ret = 0;
ASSERTZH;
+ assert(stream);
+ assert(setname);
+ assert(recs);
+ assert(num_recs>0);
+
yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs);
zh->errCode=0;
int *is_partial)
{
ASSERTZH;
+ assert(stream);
+ assert(zapt);
+ assert(position);
+ assert(num_entries);
+ assert(is_partial);
+ assert(entries);
yaz_log(LOG_API,"zebra_scan");
zh->errCode=0;
if (zebra_begin_read (zh))
int *sort_status)
{
ASSERTZH;
+ assert(stream);
+ assert(num_input_setnames>0);
+ assert(input_setnames);
+ assert(sort_sequence);
+ assert(sort_status);
yaz_log(LOG_API,"zebra_sort");
zh->errCode=0;
if (zebra_begin_read (zh))
{
int i, status;
ASSERTZH;
+ assert(num_setnames>0);
+ assert(setnames);
+ assert(statuses);
yaz_log(LOG_API,"zebra_deleleResultSet n=%d",num_setnames);
zh->errCode=0;
if (zebra_begin_read(zh))
Z_NamePlusRecord *npr = segment->segmentRecords[i];
printf ("--------------%d--------------------\n", i);
+ /* FIXME - What! printing on stdout ??? */
if (npr->which == Z_NamePlusRecord_intermediateFragment)
{
Z_FragmentSyntax *fragment = npr->u.intermediateFragment;
char *rinfo = 0;
char recid_z[256];
ASSERTZH;
+ assert(action>0 && action <=4);
+ assert(rec_buf);
+
yaz_log(LOG_API,"zebra_admin_exchange_record ac=%d", action);
zh->errCode=0;
{
ZebraHandle zh = (ZebraHandle) handle;
ISAMC_P pos;
+ ASSERTZH;
if (*info == sizeof(pos))
{
int zebra_create_database (ZebraHandle zh, const char *database)
{
ASSERTZH;
- yaz_log(LOG_API,"zebra_create_database");
+ yaz_log(LOG_API,"zebra_create_database %s",database);
+ assert(database);
zh->errCode=0;
if (zebra_select_database (zh, database))
{
WRBUF wrbuf;
ASSERTZH;
+ assert(input_str);
+ assert(output_str);
yaz_log(LOG_API,"zebra_string_norm ");
zh->errCode=0;
if (!zh->reg->zebra_maps)
int zebra_set_state (ZebraHandle zh, int val, int seqno)
+ /* FIXME - zint seqno ?? */
{
char state_fname[256];
char *fname;
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
f = fopen (fname, "w");
- yaz_log (LOG_DEBUG, "%c %d %ld", val, seqno, p);
+ yaz_log (LOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p);
fprintf (f, "%c %d %ld\n", val, seqno, p);
fclose (f);
xfree (fname);
{
const char *group = res_get(zh->res, "group");
const char *v;
+ /* FIXME - do we still use groups ?? */
zh->m_group = group;
v = res_get_prefix(zh->res, "followLinks", group, "1");
int zebra_begin_trans (ZebraHandle zh, int rw)
{
+ ASSERTZH;
if (!zh->res)
{
zh->errCode = 2;
zebra_get_state (zh, &val, &seqno);
if (val == 'c')
{
- yaz_log (LOG_LOG, "previous transaction didn't finish commit");
+ yaz_log (LOG_WARN, "previous transaction didn't finish commit");
zebra_unlock (zh->lock_shadow);
zebra_unlock (zh->lock_normal);
zebra_commit (zh);
{
BFiles bfs = bfs_create (res_get (zh->res, "shadow"),
zh->path_reg);
- yaz_log (LOG_LOG, "previous transaction didn't reach commit");
+ yaz_log (LOG_WARN, "previous transaction didn't reach commit");
bf_commitClean (bfs, rval);
bfs_destroy (bfs);
}
dirty = 1;
else if (seqno != zh->reg->seqno)
{
- yaz_log (LOG_LOG, "reopen seqno cur/old %d/%d",
+ yaz_log (LOG_DEBUG, "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",
+ yaz_log (LOG_DEBUG, "reopen last cur/old %d/%d",
val, zh->reg->last_val);
dirty = 1;
}
int zebra_end_trans (ZebraHandle zh)
{
+ ASSERTZH;
ZebraTransactionStatus dummy;
yaz_log(LOG_API,"zebra_end_trans");
return zebra_end_transaction(zh, &dummy);
const char *rval;
ASSERTZH;
+ assert(status);
yaz_log(LOG_API,"zebra_end_transaction");
status->processed = 0;
zh->trans_no--;
zh->trans_w_no = 0;
- yaz_log (LOG_LOG, "zebra_end_trans");
+ yaz_log (LOG_DEBUG, "zebra_end_trans");
rval = res_get (zh->res, "shadow");
zebraExplain_runNumberIncrement (zh->reg->zei, 1);
if (val != 'd')
{
BFiles bfs = bfs_create (rval, zh->path_reg);
- yaz_log (LOG_LOG, "deleting shadow stuff val=%c", val);
+ yaz_log (LOG_DEBUG, "deleting shadow val=%c", val);
bf_commitClean (bfs, rval);
bfs_destroy (bfs);
}
int zebra_repository_update (ZebraHandle zh, const char *path)
{
ASSERTZH;
+ assert(path);
zh->errCode=0;
- logf (LOG_LOG|LOG_API, "updating %s", path);
+ logf (LOG_API, "updating %s", path);
repositoryUpdate (zh, path);
return zh->errCode;
}
int zebra_repository_delete (ZebraHandle zh, const char *path)
{
ASSERTZH;
+ assert(path);
zh->errCode=0;
- logf (LOG_LOG|LOG_API, "deleting %s", path);
+ logf (LOG_API, "deleting %s", path);
repositoryDelete (zh, path);
return zh->errCode;
}
int zebra_repository_show (ZebraHandle zh, const char *path)
{
ASSERTZH;
+ assert(path);
yaz_log(LOG_API,"zebra_repository_show");
zh->errCode=0;
repositoryShow (zh, path);
{
zebra_set_state (zh, 'c', seqno);
- logf (LOG_LOG, "commit start");
+ logf (LOG_DEBUG, "commit start");
bf_commitExec (bfs);
#ifndef WIN32
sync ();
#endif
}
- logf (LOG_LOG, "commit clean");
+ logf (LOG_DEBUG, "commit clean");
bf_commitClean (bfs, rval);
seqno++;
zebra_set_state (zh, 'o', seqno);
int zebra_clean (ZebraHandle zh)
{
+ ASSERTZH;
yaz_log(LOG_API,"zebra_clean");
return zebra_commit_ex(zh, 1);
}
int zebra_commit (ZebraHandle zh)
{
+ ASSERTZH;
yaz_log(LOG_API,"zebra_commit");
return zebra_commit_ex(zh, 0);
}
bfs = bfs_create (res_get (zh->service->global_res, "register"),
zh->path_reg);
+ if (!bfs)
+ return -1;
if (rval && *rval)
bf_cache (bfs, rval);
int zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
ASSERTZH;
+ assert(encoding);
yaz_log(LOG_API,"zebra_record_encoding");
zh->errCode=0;
xfree (zh->record_encoding);
int zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
{
ASSERTZH;
+ assert(name);
+ assert(value);
yaz_log(LOG_API,"zebra_set_resource %s:%s",name,value);
zh->errCode=0;
res_set(zh->res, name, value);
{
const char *v;
ASSERTZH;
+ assert(name);
+ assert(defaultvalue);
v= res_get_def( zh->res, name, (char *)defaultvalue);
zh->errCode=0;
yaz_log(LOG_API,"zebra_get_resource %s:%s",name,v);
int zebra_get_shadow_enable (ZebraHandle zh)
{
+ ASSERTZH;
yaz_log(LOG_API,"zebra_get_shadow_enable");
return (zh->shadow_enable);
}
int zebra_set_shadow_enable (ZebraHandle zh, int value)
{
+ ASSERTZH;
yaz_log(LOG_API,"zebra_set_shadow_enable %d",value);
zh->shadow_enable = value;
return 0;
{
ZebraPosSet poset;
int i, *pos_array;
+ ASSERTZH;
+ assert(stream);
+ assert(setname);
+ assert(comp);
+ assert(recs);
+ assert(num_recs>0);
yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs);
if (!zh->res)
const char *buf, int buf_size, int force_update)
{
int res;
- yaz_log(LOG_API,"zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
+ ASSERTZH;
+ assert(sysno);
+ assert(buf);
+ yaz_log(LOG_API, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
int force_update)
{
int res;
+ ASSERTZH;
+ assert(sysno);
+ assert(buf);
- yaz_log(LOG_API,"zebra_update_record sysno=" ZINT_FORMAT, *sysno);
+ yaz_log(LOG_API, "zebra_update_record sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
int force_update)
{
int res;
- yaz_log(LOG_API,"zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+ ASSERTZH;
+ assert(sysno);
+ assert(buf);
+ yaz_log(LOG_API, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
if (buf_size < 1) buf_size = strlen(buf);
int res=-1;
Z_RPNQuery *query;
ODR odr = odr_createmem(ODR_ENCODE);
+ ASSERTZH;
+ assert(pqf_query);
+ assert(setname);
yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, pqf_query);
/* ---------------------------------------------------------------------------
Sort - a simplified interface, with optional read locks.
- FIXME - This is a horrible name, will conflict with half the applications
*/
int zebra_sort_by_specstr (ZebraHandle zh,
ODR stream,
{
int num_input_setnames = 0;
int sort_status = 0;
- Z_SortKeySpecList *sort_sequence = yaz_sort_spec (stream, sort_spec);
+ Z_SortKeySpecList *sort_sequence;
+ ASSERTZH;
+ assert(stream);
+ assert(sort_spec);
+ assert(output_setname);
+ assert(input_setnames);
+ sort_sequence = yaz_sort_spec (stream, sort_spec);
yaz_log(LOG_API,"sort (FIXME) ");
if (!sort_sequence)
{
projects / idzebra-moved-to-github.git / blobdiff