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
Allow dict_close of 0 pointer
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
5782aeb
..
b036ff1
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.191 2005-10-21 18:29:04 adam Exp $
+/* $Id: zebraapi.c,v 1.205 2006-03-25 15:33:29 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-36,6
+36,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include "index.h"
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include "index.h"
+#include "orddict.h"
#include <charmap.h>
#include <idzebra/api.h>
#include <charmap.h>
#include <idzebra/api.h>
@@
-72,7
+73,6
@@
static void zebra_flush_reg (ZebraHandle zh)
{
ASSERTZH;
yaz_log(log_level, "zebra_flush_reg");
{
ASSERTZH;
yaz_log(log_level, "zebra_flush_reg");
- zebra_clearError(zh);
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh, 1 /* final */);
zebraExplain_flush (zh->reg->zei, zh);
extract_flushWriteKeys (zh, 1 /* final */);
@@
-184,11
+184,18
@@
ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
const char *passwd_plain = 0;
const char *passwd_encrypt = 0;
const char *dbaccess = 0;
const char *passwd_plain = 0;
const char *passwd_encrypt = 0;
const char *dbaccess = 0;
- ZebraService zh = xmalloc(sizeof(*zh));
+ ZebraService zh = 0;
if (configName)
if (configName)
- res_read_file(res, configName);
-
+ {
+ ZEBRA_RES ret = res_read_file(res, configName);
+ if (ret != ZEBRA_OK)
+ {
+ res_close(res);
+ return 0;
+ }
+ }
+ zh = xmalloc(sizeof(*zh));
zh->global_res = res;
zh->sessions = 0;
zh->global_res = res;
zh->sessions = 0;
@@
-292,6
+299,7
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
reg->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
{
reg->dh = data1_createx (DATA1_FLAG_XML);
if (!reg->dh)
{
+ xfree(reg->name);
xfree(reg);
return 0;
}
xfree(reg);
return 0;
}
@@
-299,6
+307,7
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
if (!reg->bfs)
{
data1_destroy(reg->dh);
if (!reg->bfs)
{
data1_destroy(reg->dh);
+ xfree(reg->name);
xfree(reg);
return 0;
}
xfree(reg);
return 0;
}
@@
-308,6
+317,7
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
{
bfs_destroy(reg->bfs);
data1_destroy(reg->dh);
{
bfs_destroy(reg->bfs);
data1_destroy(reg->dh);
+ xfree(reg->name);
xfree(reg);
return 0;
}
xfree(reg);
return 0;
}
@@
-321,19
+331,27
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
data1_set_tabroot (reg->dh, reg_path);
reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
data1_set_tabroot (reg->dh, reg_path);
reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
- reg->zebra_maps = zebra_maps_open (res, reg_path);
+ if ((reg->zebra_maps = zebra_maps_open (res, reg_path)) == 0)
+ {
+ recTypes_destroy(reg->recTypes);
+ bfs_destroy(reg->bfs);
+ data1_destroy(reg->dh);
+ xfree(reg->name);
+ xfree(reg);
+ return 0;
+ }
+
reg->rank_classes = NULL;
reg->key_buf = 0;
reg->rank_classes = NULL;
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;
reg->sortKeys.buf = 0;
reg->sortKeys.buf_max = 0;
-#if NATTR
- reg->sortKeys.codec_handle = iscz1_start();
#endif
reg->records = 0;
#endif
reg->records = 0;
@@
-344,7
+362,6
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
reg->isamc = 0;
reg->isamb = 0;
reg->zei = 0;
reg->isamc = 0;
reg->isamb = 0;
reg->zei = 0;
- reg->matchDict = 0;
reg->key_file_no = 0;
reg->ptr_i = 0;
reg->key_file_no = 0;
reg->ptr_i = 0;
@@
-438,6
+455,7
@@
struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
return 0;
}
yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
return 0;
}
+
reg->active = 2;
yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg);
return reg;
reg->active = 2;
yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg);
return reg;
@@
-447,7
+465,6
@@
ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_shutdown");
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_shutdown");
- zebra_clearError(zh);
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
zebra_mutex_cond_lock (&zh->service->session_lock);
zh->service->stop_flag = 1;
@@
-460,7
+477,6
@@
ZEBRA_RES zebra_admin_start (ZebraHandle zh)
ZebraService zs;
ASSERTZH;
yaz_log(log_level, "zebra_admin_start");
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);
zs = zh->service;
zebra_mutex_cond_lock (&zs->session_lock);
zebra_mutex_cond_unlock (&zs->session_lock);
@@
-496,14
+512,13
@@
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);
- if (reg->keys.codec_handle)
- iscz1_stop(reg->keys.codec_handle);
+ zebra_rec_keys_close(reg->keys);
#if NATTR
#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
#endif
+
xfree(reg->key_buf);
xfree(reg->name);
xfree(reg);
xfree(reg->key_buf);
xfree(reg->name);
xfree(reg);
@@
-691,11
+706,11
@@
static void zebra_select_register (ZebraHandle zh, const char *new_reg)
res_set (zh->res, "lockDir", zh->path_reg);
sprintf (fname, "norm.%s.LCK", zh->reg_name);
zh->lock_normal =
res_set (zh->res, "lockDir", zh->path_reg);
sprintf (fname, "norm.%s.LCK", zh->reg_name);
zh->lock_normal =
- zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+ zebra_lock_create (res_get(zh->res, "lockDir"), fname);
sprintf (fname, "shadow.%s.LCK", zh->reg_name);
zh->lock_shadow =
sprintf (fname, "shadow.%s.LCK", zh->reg_name);
zh->lock_shadow =
- zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+ zebra_lock_create (res_get(zh->res, "lockDir"), fname);
if (!zh->lock_normal || !zh->lock_shadow)
{
if (!zh->lock_normal || !zh->lock_shadow)
{
@@
-941,7
+956,6
@@
ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
assert(hits);
assert(setname);
yaz_log(log_level, "zebra_search_rpn");
assert(hits);
assert(setname);
yaz_log(log_level, "zebra_search_rpn");
- zebra_clearError(zh);
zh->hits = 0;
*hits = 0;
zh->hits = 0;
*hits = 0;
@@
-973,7
+987,6
@@
ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs);
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,
if (!zh->res)
{
zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
@@
-1101,7
+1114,7
@@
ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
assert(is_partial);
assert(entries);
yaz_log(log_level, "zebra_scan");
assert(is_partial);
assert(entries);
yaz_log(log_level, "zebra_scan");
- zebra_clearError(zh);
+
if (zebra_begin_read (zh) == ZEBRA_FAIL)
{
*entries = 0;
if (zebra_begin_read (zh) == ZEBRA_FAIL)
{
*entries = 0;
@@
-1141,7
+1154,7
@@
ZEBRA_RES zebra_sort (ZebraHandle zh, ODR stream,
assert(sort_sequence);
assert(sort_status);
yaz_log(log_level, "zebra_sort");
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,
if (zebra_begin_read(zh) == ZEBRA_FAIL)
return ZEBRA_FAIL;
res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames,
@@
-1158,7
+1171,7
@@
int zebra_deleteResultSet(ZebraHandle zh, int function,
ASSERTZH;
assert(statuses);
yaz_log(log_level, "zebra_deleteResultSet n=%d",num_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)
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
switch (function)
@@
-1209,15
+1222,6
@@
char *zebra_errAdd (ZebraHandle zh)
return a;
}
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;
ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
{
const char *p;
@@
-1226,7
+1230,7
@@
ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
ZebraService zs;
ASSERTZH;
ZebraService zs;
ASSERTZH;
- zebra_clearError(zh);
+
zs= zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
zs= zh->service;
sprintf(u, "perm.%.30s", user ? user : "anonymous");
@@
-1256,7
+1260,6
@@
ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s",
database, record_type);
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);
if (zebra_select_database(zh, database) == ZEBRA_FAIL)
return ZEBRA_FAIL;
return zebra_begin_trans(zh, 1);
@@
-1266,7
+1269,6
@@
ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_end");
{
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_end");
- zebra_clearError(zh);
return zebra_end_trans(zh);
}
return zebra_end_trans(zh);
}
@@
-1277,7
+1279,7
@@
ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
int i;
ASSERTZH;
yaz_log(log_level, "zebra_admin_import_segment");
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];
for (i = 0; i<segment->num_segmentRecords; i++)
{
Z_NamePlusRecord *npr = segment->segmentRecords[i];
@@
-1304,11
+1306,11
@@
ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
return res;
}
return res;
}
-ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
- const char *rec_buf,
- size_t rec_len,
- const char *recid_buf, size_t recid_len,
- int action)
+ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
+ const char *rec_buf,
+ size_t rec_len,
+ const char *recid_buf, size_t recid_len,
+ int action)
/* 1 = insert. Fail it already exists */
/* 2 = replace. Fail it does not exist */
/* 3 = delete. Fail if does not exist */
/* 1 = insert. Fail it already exists */
/* 2 = replace. Fail it does not exist */
/* 3 = delete. Fail if does not exist */
@@
-1318,15
+1320,19
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
SYSNO sysno = 0;
char *rinfo = 0;
char recid_z[256];
SYSNO sysno = 0;
char *rinfo = 0;
char recid_z[256];
+ int db_ord;
ASSERTZH;
assert(action>0 && action <=4);
assert(rec_buf);
yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
ASSERTZH;
assert(action>0 && action <=4);
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))
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;
return ZEBRA_FAIL;
+ }
memcpy (recid_z, recid_buf, recid_len);
recid_z[recid_len] = 0;
memcpy (recid_z, recid_buf, recid_len);
recid_z[recid_len] = 0;
@@
-1334,13
+1340,16
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
- rinfo = dict_lookup (zh->reg->matchDict, recid_z);
+ db_ord = zebraExplain_get_database_ord(zh->reg->zei);
+ rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, recid_z);
if (rinfo)
{
if (action == 1) /* fail if insert */
{
if (rinfo)
{
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));
}
memcpy (&sysno, rinfo+1, sizeof(sysno));
@@
-1350,6
+1359,8
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
if (action == 2 || action == 3) /* fail if delete or update */
{
zebra_end_trans(zh);
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).. */
return ZEBRA_FAIL;
}
action = 1; /* make it an insert (if it's an update).. */
@@
-1361,16
+1372,22
@@
ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
&sysno,
0, /* match */
0, /* fname */
&sysno,
0, /* match */
0, /* fname */
- 0, /* force update */
+ 0, /* force update */
1 /* allow update */
);
1 /* allow update */
);
+ if (res == ZEBRA_FAIL)
+ {
+ zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
+ "Unable to parse record");
+ }
if (action == 1)
{
if (action == 1)
{
- dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
+ dict_insert_ord(zh->reg->matchDict, db_ord, recid_z,
+ sizeof(sysno), &sysno);
}
else if (action == 3)
{
}
else if (action == 3)
{
- dict_delete (zh->reg->matchDict, recid_z);
+ dict_delete_ord(zh->reg->matchDict, db_ord, recid_z);
}
zebra_end_trans(zh);
return res;
}
zebra_end_trans(zh);
return res;
@@
-1410,7
+1427,6
@@
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_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;
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
@@
-1418,14
+1434,19
@@
ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
return ZEBRA_FAIL;
if (zh->reg->isamb)
{
return ZEBRA_FAIL;
if (zh->reg->isamb)
{
+ int db_ord;
zebraExplain_curDatabase (zh->reg->zei, db);
zebraExplain_curDatabase (zh->reg->zei, db);
-
+ db_ord = zebraExplain_get_database_ord(zh->reg->zei);
+ dict_delete_subtree_ord(zh->reg->matchDict, db_ord,
+ 0 /* handle */, 0 /* func */);
zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
zebraExplain_removeDatabase(zh->reg->zei, zh);
}
else
{
yaz_log(YLOG_WARN, "drop database only supported for isam:b");
zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
zebraExplain_removeDatabase(zh->reg->zei, zh);
}
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);
ret = ZEBRA_FAIL;
}
zebra_end_trans (zh);
@@
-1437,7
+1458,6
@@
ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
ASSERTZH;
yaz_log(log_level, "zebra_create_database %s", db);
assert(db);
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;
if (zebra_select_database (zh, db) == ZEBRA_FAIL)
return ZEBRA_FAIL;
@@
-1464,7
+1484,7
@@
int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
assert(input_str);
assert(output_str);
yaz_log(log_level, "zebra_string_norm ");
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, "",
if (!zh->reg->zebra_maps)
return -1;
wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
@@
-1487,7
+1507,6
@@
static void zebra_set_state (ZebraHandle zh, int val, int seqno)
FILE *f;
ASSERTZH;
yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
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);
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
@@
-1507,7
+1526,7
@@
static void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
ASSERTZH;
yaz_log(log_level, "zebra_get_state ");
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");
sprintf (state_fname, "state.%s.LCK", zh->reg_name);
fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
f = fopen (fname, "r");
@@
-1613,8
+1632,6
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
}
zh->trans_w_no = zh->trans_no;
}
zh->trans_w_no = zh->trans_no;
- zebra_clearError(zh);
-
zh->records_inserted = 0;
zh->records_updated = 0;
zh->records_deleted = 0;
zh->records_inserted = 0;
zh->records_updated = 0;
zh->records_deleted = 0;
@@
-1658,7
+1675,7
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
yaz_log (YLOG_WARN, "previous transaction didn't reach commit");
bf_commitClean (bfs, rval);
bfs_destroy (bfs);
yaz_log (YLOG_WARN, "previous transaction didn't reach commit");
bf_commitClean (bfs, rval);
bfs_destroy (bfs);
- }
+ }
else
{
yaz_log (YLOG_WARN, "your previous transaction didn't finish");
else
{
yaz_log (YLOG_WARN, "your previous transaction didn't finish");
@@
-1694,6
+1711,7
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
yaz_log(YLOG_FATAL, "%s", zh->errString);
return ZEBRA_FAIL;
}
yaz_log(YLOG_FATAL, "%s", zh->errString);
return ZEBRA_FAIL;
}
+ zebraExplain_curDatabase(zh->reg->zei, zh->basenames[0]);
}
else
{
}
else
{
@@
-1708,7
+1726,6
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
zebra_flush_reg (zh);
return ZEBRA_OK;
}
zebra_flush_reg (zh);
return ZEBRA_OK;
}
- zebra_clearError(zh);
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
#if HAVE_SYS_TIMES_H
times (&zh->tms1);
#endif
@@
-1874,20
+1891,18
@@
int zebra_repository_update (ZebraHandle zh, const char *path)
{
ASSERTZH;
assert(path);
{
ASSERTZH;
assert(path);
- zebra_clearError(zh);
yaz_log (log_level, "updating %s", path);
repositoryUpdate (zh, path);
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);
}
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);
yaz_log (log_level, "deleting %s", path);
repositoryDelete (zh, path);
- return zh->errCode;
+ return 0;
}
int zebra_repository_show (ZebraHandle zh, const char *path)
}
int zebra_repository_show (ZebraHandle zh, const char *path)
@@
-1895,31
+1910,29
@@
int zebra_repository_show (ZebraHandle zh, const char *path)
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
ASSERTZH;
assert(path);
yaz_log(log_level, "zebra_repository_show");
- zebra_clearError(zh);
repositoryShow (zh, path);
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;
{
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;
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");
}
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_lock_w (zh->lock_normal);
@@
-1958,7
+1971,7
@@
static int zebra_commit_ex(ZebraHandle zh, int clean_only)
zebra_unlock (zh->lock_shadow);
zebra_unlock (zh->lock_normal);
zebra_unlock (zh->lock_shadow);
zebra_unlock (zh->lock_normal);
- return 0;
+ return ZEBRA_OK;
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
}
ZEBRA_RES zebra_clean(ZebraHandle zh)
@@
-1981,7
+1994,6
@@
ZEBRA_RES zebra_init(ZebraHandle zh)
BFiles bfs = 0;
ASSERTZH;
yaz_log(log_level, "zebra_init");
BFiles bfs = 0;
ASSERTZH;
yaz_log(log_level, "zebra_init");
- zebra_clearError(zh);
zebra_select_default_database(zh);
if (!zh->res)
zebra_select_default_database(zh);
if (!zh->res)
@@
-2012,7
+2024,6
@@
ZEBRA_RES zebra_compact(ZebraHandle zh)
BFiles bfs;
ASSERTZH;
yaz_log(log_level, "zebra_compact");
BFiles bfs;
ASSERTZH;
yaz_log(log_level, "zebra_compact");
- zebra_clearError(zh);
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
if (!zh->res)
{
zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
@@
-2036,7
+2047,6
@@
void zebra_shadow_enable(ZebraHandle zh, int value)
{
ASSERTZH;
yaz_log(log_level, "zebra_shadow_enable");
{
ASSERTZH;
yaz_log(log_level, "zebra_shadow_enable");
- zebra_clearError(zh);
zh->shadow_enable = value;
}
zh->shadow_enable = value;
}
@@
-2045,7
+2055,6
@@
ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
ASSERTZH;
assert(encoding);
yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
ASSERTZH;
assert(encoding);
yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
- zebra_clearError(zh);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
if (zh->iconv_to_utf8 != 0)
yaz_iconv_close(zh->iconv_to_utf8);
@@
-2068,7
+2077,6
@@
ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
{
ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
{
ASSERTZH;
yaz_log(log_level, "zebra_record_encoding");
- zebra_clearError(zh);
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
xfree(zh->record_encoding);
zh->record_encoding = 0;
if (encoding)
@@
-2082,7
+2090,6
@@
void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
assert(name);
assert(value);
yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
assert(name);
assert(value);
yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
- zebra_clearError(zh);
res_set(zh->res, name, value);
}
res_set(zh->res, name, value);
}
@@
-2093,7
+2100,6
@@
const char *zebra_get_resource(ZebraHandle zh,
ASSERTZH;
assert(name);
v = res_get_def (zh->res, name, (char *)defaultvalue);
ASSERTZH;
assert(name);
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;
}
yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
return v;
}
@@
-2146,8
+2152,7
@@
NOTE: Now returns 0 at success and updates sysno, which is an int*
int zebra_add_record(ZebraHandle zh,
const char *buf, int buf_size)
{
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 zebra_insert_record (ZebraHandle zh,
@@
-2188,10
+2193,11
@@
ZEBRA_RES zebra_update_record (ZebraHandle zh,
{
ZEBRA_RES res;
ASSERTZH;
{
ZEBRA_RES res;
ASSERTZH;
- assert(sysno);
assert(buf);
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);
if (buf_size < 1) buf_size = strlen(buf);
@@
-2357,3
+2363,12
@@
void zebra_setError_zint(ZebraHandle zh, int code, zint i)
zh->errString = nmem_strdup(zh->nmem_error, vstr);
}
zh->errString = nmem_strdup(zh->nmem_error, vstr);
}
+void zebra_lock_prefix (Res res, char *path)
+{
+ const char *lock_dir = res_get_def (res, "lockDir", "");
+
+ strcpy (path, lock_dir);
+ if (*path && path[strlen(path)-1] != '/')
+ strcat (path, "/");
+}
+