projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
64-bit offsets for register files on Windows
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
79a90b7
..
abc9124
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.80 2003-01-13 10:56:09 oleg Exp $
+/* $Id: zebraapi.c,v 1.86 2003-02-27 23:08:10 pop Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-36,12
+36,20
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "index.h"
#include <charmap.h>
#include "index.h"
#include <charmap.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)
+
static Res zebra_open_res (ZebraHandle zh);
static void zebra_close_res (ZebraHandle zh);
static Res zebra_open_res (ZebraHandle zh);
static void zebra_close_res (ZebraHandle zh);
-static void zebra_chdir (ZebraService zh)
+
+static void zebra_chdir (ZebraService zs)
{
{
- const char *dir = res_get (zh->global_res, "chdir");
+ const char *dir ;
+ ASSERTZS;
+ dir = res_get (zs->global_res, "chdir");
if (!dir)
return;
logf (LOG_DEBUG, "chdir %s", dir);
if (!dir)
return;
logf (LOG_DEBUG, "chdir %s", dir);
@@
-54,6
+62,8
@@
static void zebra_chdir (ZebraService zh)
static void zebra_flush_reg (ZebraHandle zh)
{
static void zebra_flush_reg (ZebraHandle zh)
{
+ ASSERTZH;
+ zh->errCode=0;
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh);
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh);
@@
-71,6
+81,7
@@
ZebraHandle zebra_open (ZebraService zs)
{
ZebraHandle zh;
const char *default_encoding;
{
ZebraHandle zh;
const char *default_encoding;
+ ASSERTZS;
if (!zs)
return 0;
if (!zs)
return 0;
@@
-169,6
+180,8
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
int record_compression = REC_COMPRESS_NONE;
char *recordCompression = 0;
int record_compression = REC_COMPRESS_NONE;
char *recordCompression = 0;
+ ASSERTZS;
+
reg = xmalloc (sizeof(*reg));
assert (name);
reg = xmalloc (sizeof(*reg));
assert (name);
@@
-206,6
+219,8
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
reg->keys.buf_max = 0;
reg->keys.buf = 0;
reg->keys.buf_max = 0;
reg->keys.buf = 0;
+ reg->sortKeys.buf = 0;
+ reg->sortKeys.buf_max = 0;
reg->records = 0;
reg->dict = 0;
reg->records = 0;
reg->dict = 0;
@@
-221,6
+236,7
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
reg->key_file_no = 0;
zebraRankInstall (reg, rank1_class);
reg->key_file_no = 0;
zebraRankInstall (reg, rank1_class);
+ zebraRankInstall (reg, rankzv_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
@@
-335,6
+351,9
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
void zebra_admin_shutdown (ZebraHandle zh)
{
void zebra_admin_shutdown (ZebraHandle zh)
{
+ ASSERTZH;
+ zh->errCode=0;
+
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
zebra_mutex_cond_unlock (&zh->service->session_lock);
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
zebra_mutex_cond_unlock (&zh->service->session_lock);
@@
-342,14
+361,17
@@
void zebra_admin_shutdown (ZebraHandle zh)
void zebra_admin_start (ZebraHandle zh)
{
void zebra_admin_start (ZebraHandle zh)
{
- ZebraService zs = zh->service;
- zh->errCode = 0;
+ ZebraService zs;
+ ASSERTZH;
+ zh->errCode=0;
+ zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
zebra_mutex_cond_unlock (&zs->session_lock);
}
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
{
zebra_mutex_cond_lock (&zs->session_lock);
zebra_mutex_cond_unlock (&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);
reg->stop_flag = 0;
zebra_chdir (zs);
yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg);
reg->stop_flag = 0;
zebra_chdir (zs);
@@
-379,16
+401,18
@@
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
bfs_destroy (reg->bfs);
data1_destroy (reg->dh);
bfs_destroy (reg->bfs);
data1_destroy (reg->dh);
+ xfree (reg->sortKeys.buf);
+ xfree (reg->keys.buf);
+
xfree (reg->key_buf);
xfree (reg->name);
xfree (reg);
xfree (reg->key_buf);
xfree (reg->name);
xfree (reg);
- yaz_log(LOG_DEBUG, "zebra_register_close 2");
}
void zebra_stop(ZebraService zs)
{
if (!zs)
}
void zebra_stop(ZebraService zs)
{
if (!zs)
- return ;
+ return ;
yaz_log (LOG_LOG, "zebra_stop");
while (zs->sessions)
yaz_log (LOG_LOG, "zebra_stop");
while (zs->sessions)
@@
-411,23
+435,29
@@
void zebra_close (ZebraHandle zh)
{
ZebraService zs;
struct zebra_session **sp;
{
ZebraService zs;
struct zebra_session **sp;
+ int i;
if (!zh)
return;
if (!zh)
return;
-
+ ASSERTZH;
+ zh->errCode=0;
+
zs = zh->service;
yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh);
if (!zh)
zs = zh->service;
yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh);
if (!zh)
- return ;
+ return ;
resultSetDestroy (zh, -1, 0, 0);
resultSetDestroy (zh, -1, 0, 0);
-
if (zh->reg)
zebra_register_close (zh->service, zh->reg);
zebra_close_res (zh);
xfree (zh->record_encoding);
if (zh->reg)
zebra_register_close (zh->service, zh->reg);
zebra_close_res (zh);
xfree (zh->record_encoding);
+ for (i = 0; i < zh->num_basenames; i++)
+ xfree (zh->basenames[i]);
+ xfree (zh->basenames);
+
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close (zh->iconv_to_utf8);
if (zh->iconv_from_utf8 != 0)
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close (zh->iconv_to_utf8);
if (zh->iconv_from_utf8 != 0)
@@
-450,6
+480,7
@@
void zebra_close (ZebraHandle zh)
}
zebra_mutex_cond_unlock (&zs->session_lock);
xfree (zh->reg_name);
}
zebra_mutex_cond_unlock (&zs->session_lock);
xfree (zh->reg_name);
+ zh->service=0; /* more likely to trigger an assert */
xfree (zh);
}
xfree (zh);
}
@@
-467,6
+498,9
@@
static Res zebra_open_res (ZebraHandle zh)
{
Res res = 0;
char fname[512];
{
Res res = 0;
char fname[512];
+ ASSERTZH;
+ zh->errCode=0;
+
if (zh->path_reg)
{
sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
if (zh->path_reg)
{
sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
@@
-488,6
+522,8
@@
static Res zebra_open_res (ZebraHandle zh)
static void zebra_close_res (ZebraHandle zh)
{
static void zebra_close_res (ZebraHandle zh)
{
+ ASSERTZH;
+ zh->errCode=0;
if (zh->res != zh->service->global_res)
res_close (zh->res);
zh->res = 0;
if (zh->res != zh->service->global_res)
res_close (zh->res);
zh->res = 0;
@@
-495,6
+531,8
@@
static void zebra_close_res (ZebraHandle zh)
static int zebra_select_register (ZebraHandle zh, const char *new_reg)
{
static int zebra_select_register (ZebraHandle zh, const char *new_reg)
{
+ ASSERTZH;
+ zh->errCode=0;
if (zh->res && strcmp (zh->reg_name, new_reg) == 0)
return 0;
if (!zh->res)
if (zh->res && strcmp (zh->reg_name, new_reg) == 0)
return 0;
if (!zh->res)
@@
-571,7
+609,7
@@
void map_basenames_func (void *vp, const char *name, const char *value)
return ;
no--;
for (i = 0; i<p->num_bases; i++)
return ;
no--;
for (i = 0; i<p->num_bases; i++)
- if (p->basenames[i] && !strcmp (p->basenames[i], fromdb))
+ if (p->basenames[i] && !STRCASECMP (p->basenames[i], fromdb))
{
p->basenames[i] = 0;
for (i = 0; i < no; i++)
{
p->basenames[i] = 0;
for (i = 0; i < no; i++)
@@
-591,6
+629,8
@@
void map_basenames (ZebraHandle zh, ODR stream,
struct map_baseinfo info;
struct map_baseinfo *p = &info;
int i;
struct map_baseinfo info;
struct map_baseinfo *p = &info;
int i;
+ ASSERTZH;
+ zh->errCode=0;
info.zh = zh;
info.num_bases = *num_bases;
info.zh = zh;
info.num_bases = *num_bases;
@@
-617,6
+657,8
@@
void map_basenames (ZebraHandle zh, ODR stream,
int zebra_select_database (ZebraHandle zh, const char *basename)
{
int zebra_select_database (ZebraHandle zh, const char *basename)
{
+ ASSERTZH;
+ zh->errCode=0;
return zebra_select_databases (zh, 1, &basename);
}
return zebra_select_databases (zh, 1, &basename);
}
@@
-627,6
+669,8
@@
int zebra_select_databases (ZebraHandle zh, int num_bases,
const char *cp;
int len = 0;
char *new_reg = 0;
const char *cp;
int len = 0;
char *new_reg = 0;
+ ASSERTZH;
+ zh->errCode=0;
if (num_bases < 1)
{
if (num_bases < 1)
{
@@
-698,6
+742,8
@@
int zebra_select_databases (ZebraHandle zh, int num_bases,
void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
Z_RPNQuery *query, const char *setname, int *hits)
{
void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
Z_RPNQuery *query, const char *setname, int *hits)
{
+ ASSERTZH;
+ zh->errCode=0;
zh->hits = 0;
*hits = 0;
zh->hits = 0;
*hits = 0;
@@
-718,6
+764,8
@@
void zebra_records_retrieve (ZebraHandle zh, ODR stream,
{
ZebraPosSet poset;
int i, *pos_array;
{
ZebraPosSet poset;
int i, *pos_array;
+ ASSERTZH;
+ zh->errCode=0;
if (!zh->res)
{
if (!zh->res)
{
@@
-784,6
+832,8
@@
void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
int *position, int *num_entries, ZebraScanEntry **entries,
int *is_partial)
{
int *position, int *num_entries, ZebraScanEntry **entries,
int *is_partial)
{
+ ASSERTZH;
+ zh->errCode=0;
if (zebra_begin_read (zh))
{
*entries = 0;
if (zebra_begin_read (zh))
{
*entries = 0;
@@
-801,6
+851,8
@@
void zebra_sort (ZebraHandle zh, ODR stream,
const char *output_setname, Z_SortKeySpecList *sort_sequence,
int *sort_status)
{
const char *output_setname, Z_SortKeySpecList *sort_sequence,
int *sort_status)
{
+ ASSERTZH;
+ zh->errCode=0;
if (zebra_begin_read (zh))
return;
resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
if (zebra_begin_read (zh))
return;
resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
@@
-813,6
+865,8
@@
int zebra_deleleResultSet(ZebraHandle zh, int function,
int *statuses)
{
int i, status;
int *statuses)
{
int i, status;
+ ASSERTZH;
+ zh->errCode=0;
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
@@
-834,22
+888,31
@@
int zebra_deleleResultSet(ZebraHandle zh, int function,
int zebra_errCode (ZebraHandle zh)
{
int zebra_errCode (ZebraHandle zh)
{
- return zh->errCode;
+ if (zh)
+ return zh->errCode;
+ return 0;
}
const char *zebra_errString (ZebraHandle zh)
{
}
const char *zebra_errString (ZebraHandle zh)
{
- return diagbib1_str (zh->errCode);
+ if (zh)
+ return diagbib1_str (zh->errCode);
+ return "";
}
char *zebra_errAdd (ZebraHandle zh)
{
}
char *zebra_errAdd (ZebraHandle zh)
{
- return zh->errString;
+ if (zh)
+ return zh->errString;
+ return "";
}
int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
{
}
int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
{
- ZebraService zs = zh->service;
+ ZebraService zs;
+ ASSERTZH;
+ zh->errCode=0;
+ zs= zh->service;
if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass))
{
logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS");
if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass))
{
logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS");
@@
-863,6
+926,8
@@
int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
void zebra_admin_import_begin (ZebraHandle zh, const char *database,
const char *record_type)
{
void zebra_admin_import_begin (ZebraHandle zh, const char *database,
const char *record_type)
{
+ ASSERTZH;
+ zh->errCode=0;
if (zebra_select_database(zh, database))
return;
zebra_begin_trans (zh);
if (zebra_select_database(zh, database))
return;
zebra_begin_trans (zh);
@@
-872,6
+937,8
@@
void zebra_admin_import_begin (ZebraHandle zh, const char *database,
void zebra_admin_import_end (ZebraHandle zh)
{
void zebra_admin_import_end (ZebraHandle zh)
{
+ ASSERTZH;
+ zh->errCode=0;
zebra_end_trans (zh);
}
zebra_end_trans (zh);
}
@@
-879,6
+946,8
@@
void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
{
int sysno;
int i;
{
int sysno;
int i;
+ ASSERTZH;
+ zh->errCode=0;
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
@@
-921,6
+990,8
@@
int zebra_admin_exchange_record (ZebraHandle zh,
int sysno = 0;
char *rinfo = 0;
char recid_z[256];
int sysno = 0;
char *rinfo = 0;
char recid_z[256];
+ ASSERTZH;
+ zh->errCode=0;
if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
return -1;
if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
return -1;
@@
-956,6
+1027,8
@@
int zebra_admin_exchange_record (ZebraHandle zh,
void zebra_admin_create (ZebraHandle zh, const char *database)
{
ZebraService zs;
void zebra_admin_create (ZebraHandle zh, const char *database)
{
ZebraService zs;
+ ASSERTZH;
+ zh->errCode=0;
if (zebra_select_database (zh, database))
return;
if (zebra_select_database (zh, database))
return;
@@
-977,6
+1050,8
@@
int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
char *output_str, int output_len)
{
WRBUF wrbuf;
char *output_str, int output_len)
{
WRBUF wrbuf;
+ ASSERTZH;
+ zh->errCode=0;
if (!zh->reg->zebra_maps)
return -1;
wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
if (!zh->reg->zebra_maps)
return -1;
wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
@@
-998,6
+1073,8
@@
void zebra_set_state (ZebraHandle zh, int val, int seqno)
char *fname;
long p = getpid();
FILE *f;
char *fname;
long p = getpid();
FILE *f;
+ ASSERTZH;
+ zh->errCode=0;
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
@@
-1015,6
+1092,8
@@
void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
char *fname;
FILE *f;
char *fname;
FILE *f;
+ ASSERTZH;
+ zh->errCode=0;
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
f = fopen (fname, "r");
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
f = fopen (fname, "r");
@@
-1034,6
+1113,7
@@
int zebra_begin_read (ZebraHandle zh)
int dirty = 0;
char val;
int seqno;
int dirty = 0;
char val;
int seqno;
+ ASSERTZH;
assert (zh->res);
assert (zh->res);
@@
-1044,6
+1124,7
@@
int zebra_begin_read (ZebraHandle zh)
zebra_flush_reg (zh);
return 0;
}
zebra_flush_reg (zh);
return 0;
}
+ zh->errCode=0;
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
@@
-1103,11
+1184,11
@@
int zebra_begin_read (ZebraHandle zh)
void zebra_end_read (ZebraHandle zh)
{
void zebra_end_read (ZebraHandle zh)
{
+ ASSERTZH;
(zh->trans_no)--;
if (zh->trans_no != 0)
return;
(zh->trans_no)--;
if (zh->trans_no != 0)
return;
-
#if HAVE_SYS_TIMES_H
times (&zh->tms2);
logf (LOG_LOG, "user/system: %ld/%ld",
#if HAVE_SYS_TIMES_H
times (&zh->tms2);
logf (LOG_LOG, "user/system: %ld/%ld",
@@
-1126,6
+1207,7
@@
void zebra_begin_trans (ZebraHandle zh)
int seqno = 0;
char val = '?';
const char *rval = 0;
int seqno = 0;
char val = '?';
const char *rval = 0;
+ ASSERTZHRES;
assert (zh->res);
assert (zh->res);
@@
-1134,6
+1216,7
@@
void zebra_begin_trans (ZebraHandle zh)
{
return;
}
{
return;
}
+ zh->errCode=0;
yaz_log (LOG_LOG, "zebra_begin_trans");
yaz_log (LOG_LOG, "zebra_begin_trans");
@@
-1204,16
+1287,29
@@
void zebra_begin_trans (ZebraHandle zh)
zh->reg->seqno = seqno;
}
zh->reg->seqno = seqno;
}
-void zebra_end_trans (ZebraHandle zh)
+void zebra_end_trans (ZebraHandle zh) {
+ ZebraTransactionStatus dummy;
+ zebra_end_transaction(zh, &dummy);
+}
+
+void zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
{
char val;
int seqno;
const char *rval;
{
char val;
int seqno;
const char *rval;
+ ASSERTZH;
+
+ status->processed = 0;
+ status->inserted = 0;
+ status->updated = 0;
+ status->deleted = 0;
+ status->utime = 0;
+ status->stime = 0;
+
zh->trans_no--;
if (zh->trans_no != 0)
return;
zh->trans_no--;
if (zh->trans_no != 0)
return;
-
yaz_log (LOG_LOG, "zebra_end_trans");
rval = res_get (zh->res, "shadow");
yaz_log (LOG_LOG, "zebra_end_trans");
rval = res_get (zh->res, "shadow");
@@
-1228,6
+1324,11
@@
void zebra_end_trans (ZebraHandle zh)
zh->records_processed, zh->records_inserted,
zh->records_updated, zh->records_deleted);
zh->records_processed, zh->records_inserted,
zh->records_updated, zh->records_deleted);
+ status->processed = zh->records_processed;
+ status->inserted = zh->records_inserted;
+ status->updated = zh->records_updated;
+ status->deleted = zh->records_deleted;
+
zebra_get_state (zh, &val, &seqno);
if (val != 'd')
{
zebra_get_state (zh, &val, &seqno);
if (val != 'd')
{
@@
-1249,23
+1350,33
@@
void zebra_end_trans (ZebraHandle zh)
(long) (zh->tms2.tms_utime - zh->tms1.tms_utime),
(long) (zh->tms2.tms_stime - zh->tms1.tms_stime));
(long) (zh->tms2.tms_utime - zh->tms1.tms_utime),
(long) (zh->tms2.tms_stime - zh->tms1.tms_stime));
+ status->utime = (long) (zh->tms2.tms_utime - zh->tms1.tms_utime);
+ status->stime = (long) (zh->tms2.tms_stime - zh->tms1.tms_stime);
#endif
#endif
+
+ return;
}
void zebra_repository_update (ZebraHandle zh)
{
}
void zebra_repository_update (ZebraHandle zh)
{
+ ASSERTZH;
+ zh->errCode=0;
logf (LOG_LOG, "updating %s", zh->rGroup.path);
repositoryUpdate (zh);
}
void zebra_repository_delete (ZebraHandle zh)
{
logf (LOG_LOG, "updating %s", zh->rGroup.path);
repositoryUpdate (zh);
}
void zebra_repository_delete (ZebraHandle zh)
{
+ ASSERTZH;
+ zh->errCode=0;
logf (LOG_LOG, "deleting %s", zh->rGroup.path);
repositoryDelete (zh);
}
void zebra_repository_show (ZebraHandle zh)
{
logf (LOG_LOG, "deleting %s", zh->rGroup.path);
repositoryDelete (zh);
}
void zebra_repository_show (ZebraHandle zh)
{
+ ASSERTZH;
+ zh->errCode=0;
repositoryShow (zh);
}
repositoryShow (zh);
}
@@
-1275,6
+1386,8
@@
int zebra_commit (ZebraHandle zh)
char val;
const char *rval;
BFiles bfs;
char val;
const char *rval;
BFiles bfs;
+ ASSERTZH;
+ zh->errCode=0;
if (!zh->res)
{
if (!zh->res)
{
@@
-1327,6
+1440,8
@@
int zebra_init (ZebraHandle zh)
{
const char *rval;
BFiles bfs = 0;
{
const char *rval;
BFiles bfs = 0;
+ ASSERTZH;
+ zh->errCode=0;
if (!zh->res)
{
if (!zh->res)
{
@@
-1349,6
+1464,8
@@
int zebra_init (ZebraHandle zh)
int zebra_compact (ZebraHandle zh)
{
BFiles bfs;
int zebra_compact (ZebraHandle zh)
{
BFiles bfs;
+ ASSERTZH;
+ zh->errCode=0;
if (!zh->res)
{
zh->errCode = 109;
if (!zh->res)
{
zh->errCode = 109;
@@
-1363,7
+1480,12
@@
int zebra_compact (ZebraHandle zh)
int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
{
int sysno = 0;
int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
{
int sysno = 0;
+ int olderr;
+ ASSERTZH;
+ zh->errCode=0;
zebra_begin_trans (zh);
zebra_begin_trans (zh);
+ if (zh->errCode)
+ return 0; /* bad sysno */
extract_rec_in_mem (zh, "grs.sgml",
buf, len,
"Default", /* database */
extract_rec_in_mem (zh, "grs.sgml",
buf, len,
"Default", /* database */
@@
-1373,28
+1495,38
@@
int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
1 /* store_keys */,
1 /* store_data */,
0 /* match criteria */);
1 /* store_keys */,
1 /* store_data */,
0 /* match criteria */);
+ olderr=zh->errCode;
zebra_end_trans (zh);
zebra_end_trans (zh);
+ if (olderr)
+ zh->errCode=olderr;
return sysno;
}
void zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
{
return sysno;
}
void zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
{
+ ASSERTZH;
+ zh->errCode=0;
memcpy (&zh->rGroup, rg, sizeof(*rg));
}
void zebra_result (ZebraHandle zh, int *code, char **addinfo)
{
memcpy (&zh->rGroup, rg, sizeof(*rg));
}
void zebra_result (ZebraHandle zh, int *code, char **addinfo)
{
+ ASSERTZH;
*code = zh->errCode;
*addinfo = zh->errString;
}
void zebra_shadow_enable (ZebraHandle zh, int value)
{
*code = zh->errCode;
*addinfo = zh->errString;
}
void zebra_shadow_enable (ZebraHandle zh, int value)
{
+ ASSERTZH;
+ zh->errCode=0;
zh->shadow_enable = value;
}
int zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
zh->shadow_enable = value;
}
int zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
+ ASSERTZH;
+ zh->errCode=0;
xfree (zh->record_encoding);
/*
xfree (zh->record_encoding);
/*
@@
-1402,9
+1534,9
@@
int zebra_record_encoding (ZebraHandle zh, const char *encoding)
*/
if (zh->iconv_to_utf8 != 0)
*/
if (zh->iconv_to_utf8 != 0)
- yaz_iconv_close(zh->iconv_to_utf8);
+ yaz_iconv_close(zh->iconv_to_utf8);
if (zh->iconv_from_utf8 != 0)
if (zh->iconv_from_utf8 != 0)
- yaz_iconv_close(zh->iconv_from_utf8);
+ yaz_iconv_close(zh->iconv_from_utf8);
zh->record_encoding = xstrdup (encoding);
zh->record_encoding = xstrdup (encoding);
@@
-1424,11
+1556,15
@@
int zebra_record_encoding (ZebraHandle zh, const char *encoding)
void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
{
void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
{
+ ASSERTZH;
+ zh->errCode=0;
res_put(zh->res, name, value);
}
const char *zebra_get_resource(ZebraHandle zh,
const char *name, const char *defaultvalue)
{
res_put(zh->res, name, value);
}
const char *zebra_get_resource(ZebraHandle zh,
const char *name, const char *defaultvalue)
{
+ ASSERTZH;
+ zh->errCode=0;
return res_get_def( zh->res, name, (char *)defaultvalue);
}
return res_get_def( zh->res, name, (char *)defaultvalue);
}